diff --git a/Assets/Editor/InspectorTools/CharacterHelperInspector.cs b/Assets/Editor/InspectorTools/CharacterHelperInspector.cs index 2cc7d4013..80e40de45 100644 --- a/Assets/Editor/InspectorTools/CharacterHelperInspector.cs +++ b/Assets/Editor/InspectorTools/CharacterHelperInspector.cs @@ -13,6 +13,7 @@ namespace BFEditor public class CharacterSpineHelperInspector : Editor { private const uint HASH_SEED = 31; + private string m_CurAnimationName; CharacterSpineHelper helper; static CharacterSpineHelperInspector() @@ -243,6 +244,33 @@ namespace BFEditor DrawNodeList(); EditorGUILayout.LabelField("", GUI.skin.horizontalSlider); + + GUILayout.Label("动作列表:", EditorStyles.label); + + DrawAnimationList(); + } + + private void DrawAnimationList() + { + GUIStyle normalStyle = new GUIStyle(GUI.skin.button);//普通style + normalStyle.alignment = TextAnchor.MiddleLeft; + + GUIStyle highlightStyle = new GUIStyle(GUI.skin.button);//高亮style + highlightStyle.alignment = TextAnchor.MiddleLeft; + highlightStyle.normal.textColor = Color.blue; + + Spine.Unity.SkeletonGraphic skeletonGraphic = helper.transform.GetComponentInChildren(true); + var list = skeletonGraphic.skeletonDataAsset.GetAnimationStateData().SkeletonData.Animations; + for (int i = 0; i < list.Count; i ++) + { + bool isPlay = list.Items[i].Name == m_CurAnimationName; + GUILayout.BeginHorizontal(); + if (GUILayout.Button(string.Format("动作:{0}==============时长:{1}s", list.Items[i].Name, list.Items[i].Duration), isPlay ? highlightStyle : normalStyle)) + { + } + GUILayout.EndHorizontal(); + } + EditorGUILayout.LabelField("", GUI.skin.horizontalSlider); } private static uint BKDRHash(string name) diff --git a/Assets/arts/spines/characters/p0001.meta b/Assets/arts/spines/characters/p0001.meta new file mode 100644 index 000000000..6db41a8a6 --- /dev/null +++ b/Assets/arts/spines/characters/p0001.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bebd2bb30bc122d4d8109339ef3448fb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001.atlas.txt b/Assets/arts/spines/characters/p0001/p0001.atlas.txt new file mode 100644 index 000000000..4c94d7116 --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001.atlas.txt @@ -0,0 +1,50 @@ +p0001.png +size:512,512 +filter:Linear,Linear +canying +bounds:2,237,420,273 +offsets:15,10,445,297 +dao1 +bounds:2,141,143,94 +dao2 +bounds:2,4,129,29 +hit_yan1 +bounds:200,91,16,18 +rotate:90 +pifeng1 +bounds:424,305,63,99 +pifeng2 +bounds:424,406,83,104 +pifeng3 +bounds:2,35,126,104 +shenti +bounds:352,156,79,66 +rotate:90 +tou +bounds:266,153,84,82 +toufa1 +bounds:147,137,117,98 +yaodai +bounds:489,329,75,21 +rotate:90 +youbi +bounds:171,91,27,44 +youerhuan +bounds:130,45,25,26 +youshou +bounds:200,109,41,26 +youtui +bounds:424,235,68,60 +rotate:90 +youyan +bounds:171,73,16,20 +rotate:90 +zuobi +bounds:130,73,39,62 +zuoerhuan +bounds:243,109,25,26 +zuotui +bounds:420,165,68,60 +rotate:90 +zuoyan +bounds:489,307,17,20 diff --git a/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta b/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta new file mode 100644 index 000000000..6d240fa09 --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c42fd9649250aa499d45c6b76009a3e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001.png b/Assets/arts/spines/characters/p0001/p0001.png new file mode 100644 index 000000000..590fab7d0 Binary files /dev/null and b/Assets/arts/spines/characters/p0001/p0001.png differ diff --git a/Assets/arts/spines/characters/p0001/p0001.png.meta b/Assets/arts/spines/characters/p0001/p0001.png.meta new file mode 100644 index 000000000..bf0bc5839 --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 63f2bea8eb8d62249a1b63b81ea4db8f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes b/Assets/arts/spines/characters/p0001/p0001.skel.bytes new file mode 100644 index 000000000..7d1745bce Binary files /dev/null and b/Assets/arts/spines/characters/p0001/p0001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta b/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta new file mode 100644 index 000000000..17d7d6d3a --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0fb48e7b6a5670498079ed14a606da2 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001_atlas.asset b/Assets/arts/spines/characters/p0001/p0001_atlas.asset new file mode 100644 index 000000000..462b3845c --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001_atlas.asset @@ -0,0 +1,17 @@ +%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: p0001_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 4c42fd9649250aa499d45c6b76009a3e, type: 3} + materials: + - {fileID: 2100000, guid: 9ed3a68a2744bbb43b94fcbaf5a4ad9b, type: 2} diff --git a/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta b/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta new file mode 100644 index 000000000..a04e33fae --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4e55dafaf3625341807eedc5a302738 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001_material.mat b/Assets/arts/spines/characters/p0001/p0001_material.mat new file mode 100644 index 000000000..ef827054b --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001_material.mat @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: p0001_material + m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _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: 63f2bea8eb8d62249a1b63b81ea4db8f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/p0001/p0001_material.mat.meta b/Assets/arts/spines/characters/p0001/p0001_material.mat.meta new file mode 100644 index 000000000..68ea739bb --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ed3a68a2744bbb43b94fcbaf5a4ad9b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset b/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset new file mode 100644 index 000000000..1cee9b3f8 --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001_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: p0001_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: c4e55dafaf3625341807eedc5a302738, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: e0fb48e7b6a5670498079ed14a606da2, 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/p0001/p0001_skeletondata.asset.meta b/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset.meta new file mode 100644 index 000000000..ea9f26ff2 --- /dev/null +++ b/Assets/arts/spines/characters/p0001/p0001_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c7297de721c6b84b8cb96644f5fd288 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002.meta b/Assets/arts/spines/characters/p0002.meta new file mode 100644 index 000000000..78cad029b --- /dev/null +++ b/Assets/arts/spines/characters/p0002.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c83f27d5ac60a8b4cb01ed0b8c4dfb34 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002.atlas.txt b/Assets/arts/spines/characters/p0002/p0002.atlas.txt new file mode 100644 index 000000000..819b651d3 --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002.atlas.txt @@ -0,0 +1,55 @@ +p0002.png +size:1024,1024 +filter:Linear,Linear +dun +bounds:2,162,90,126 +gutou +bounds:432,621,70,53 +hit_yan1 +bounds:94,163,16,18 +jinfanzei_skill1-animation_00 +bounds:2,290,348,113 +offsets:134,60,484,222 +jinfanzei_skill1-animation_01 +bounds:2,405,393,211 +offsets:42,6,484,222 +jinfanzei_skill1-animation_02 +bounds:2,831,466,175 +offsets:16,25,484,222 +jinfanzei_skill1-animation_03 +bounds:2,618,428,211 +offsets:7,6,484,222 +jinfanzei_skill1-animation_04 +bounds:470,831,422,175 +offsets:16,25,484,222 +jinfanzei_skill1-animation_05 +bounds:432,676,371,153 +offsets:7,34,484,222 +lian +bounds:2,122,68,38 +shenti +bounds:805,723,106,75 +rotate:90 +toukui +bounds:94,183,96,105 +wuqi +bounds:894,839,67,167 +xiabai +bounds:397,582,30,34 +youbi +bounds:192,236,41,52 +youshou +bounds:504,647,30,27 +youtui +bounds:352,332,43,71 +youyan +bounds:963,911,7,22 +zuobi +bounds:805,680,41,51 +rotate:90 +zuoshou +bounds:352,303,29,27 +zuotui +bounds:963,935,43,71 +zuoyan +bounds:882,807,8,22 diff --git a/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta b/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta new file mode 100644 index 000000000..13471a608 --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f773f49d3c1c2544a227c0130bb8ae9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002.png b/Assets/arts/spines/characters/p0002/p0002.png new file mode 100644 index 000000000..64acf1136 Binary files /dev/null and b/Assets/arts/spines/characters/p0002/p0002.png differ diff --git a/Assets/arts/spines/characters/p0002/p0002.png.meta b/Assets/arts/spines/characters/p0002/p0002.png.meta new file mode 100644 index 000000000..f870b9e62 --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 0e2b6342ae1ff9b47afc8cec7e69879a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002.skel.bytes b/Assets/arts/spines/characters/p0002/p0002.skel.bytes new file mode 100644 index 000000000..230617418 Binary files /dev/null and b/Assets/arts/spines/characters/p0002/p0002.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta b/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta new file mode 100644 index 000000000..7b22065b5 --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2f5de35c741a2384a952d4cf8d766f1f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002_atlas.asset b/Assets/arts/spines/characters/p0002/p0002_atlas.asset new file mode 100644 index 000000000..d10754203 --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002_atlas.asset @@ -0,0 +1,17 @@ +%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: p0002_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 0f773f49d3c1c2544a227c0130bb8ae9, type: 3} + materials: + - {fileID: 2100000, guid: dfe00899b5421c84c918b3411210e5af, type: 2} diff --git a/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta b/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta new file mode 100644 index 000000000..e7ef3f3bb --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaff2e9fec24bdb4fbb7003fefa828dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002_material.mat b/Assets/arts/spines/characters/p0002/p0002_material.mat new file mode 100644 index 000000000..b0702fe80 --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002_material.mat @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: p0002_material + m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _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: 0e2b6342ae1ff9b47afc8cec7e69879a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/p0002/p0002_material.mat.meta b/Assets/arts/spines/characters/p0002/p0002_material.mat.meta new file mode 100644 index 000000000..df40fbb9d --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dfe00899b5421c84c918b3411210e5af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset b/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset new file mode 100644 index 000000000..76c9b3a1f --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002_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: p0002_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: eaff2e9fec24bdb4fbb7003fefa828dd, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 2f5de35c741a2384a952d4cf8d766f1f, 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/p0002/p0002_skeletondata.asset.meta b/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset.meta new file mode 100644 index 000000000..f70efba25 --- /dev/null +++ b/Assets/arts/spines/characters/p0002/p0002_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 172156a70a38fef4585d133365f0170c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/m0001.prefab b/Assets/prefabs/spine/ui/characters/m0001.prefab index 0653734db..f6e9d2167 100644 --- a/Assets/prefabs/spine/ui/characters/m0001.prefab +++ b/Assets/prefabs/spine/ui/characters/m0001.prefab @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 6e85e327bf7bc5e4c985102ae0c647b0, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 172156a70a38fef4585d133365f0170c, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0001.prefab b/Assets/prefabs/spine/ui/characters/p0001.prefab index 0ee1b357b..5a287ea6d 100644 --- a/Assets/prefabs/spine/ui/characters/p0001.prefab +++ b/Assets/prefabs/spine/ui/characters/p0001.prefab @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 75ce232dc821064409141199ae6a492d, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0002.prefab b/Assets/prefabs/spine/ui/characters/p0002.prefab index a0c618c4e..5a8680007 100644 --- a/Assets/prefabs/spine/ui/characters/p0002.prefab +++ b/Assets/prefabs/spine/ui/characters/p0002.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2951863086470196126} - - component: {fileID: 153405249699139444} + - component: {fileID: -6083284349890068408} m_Layer: 5 m_Name: p0002 m_TagString: Untagged @@ -37,7 +37,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &153405249699139444 +--- !u!114 &-6083284349890068408 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 8072049d80e957e42810ed5d9f6c8bce, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0002.prefab.meta b/Assets/prefabs/spine/ui/characters/p0002.prefab.meta index 6f487800f..bc707d9c3 100644 --- a/Assets/prefabs/spine/ui/characters/p0002.prefab.meta +++ b/Assets/prefabs/spine/ui/characters/p0002.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c04df7aede15e545ab6919bff7af50d +guid: 95c3c216cee4a9f45857a384b3bc0635 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/prefabs/spine/ui/characters/p0003.prefab b/Assets/prefabs/spine/ui/characters/p0003.prefab index e7060d817..ae040b421 100644 --- a/Assets/prefabs/spine/ui/characters/p0003.prefab +++ b/Assets/prefabs/spine/ui/characters/p0003.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2951863086470196126} - - component: {fileID: -5697558201049756281} + - component: {fileID: -6083284349890068408} m_Layer: 5 m_Name: p0003 m_TagString: Untagged @@ -37,7 +37,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &-5697558201049756281 +--- !u!114 &-6083284349890068408 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 69f7232728889e3418e53e01f444f8a0, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0003.prefab.meta b/Assets/prefabs/spine/ui/characters/p0003.prefab.meta index 516f977dc..3e8e4aaee 100644 --- a/Assets/prefabs/spine/ui/characters/p0003.prefab.meta +++ b/Assets/prefabs/spine/ui/characters/p0003.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10773b5cfe30e854f94b6fe70f4e41ac +guid: 48b98f1bd154bb94c8f48f32589cc5cd PrefabImporter: externalObjects: {} userData: diff --git a/Assets/prefabs/spine/ui/characters/p0004.prefab b/Assets/prefabs/spine/ui/characters/p0004.prefab index 911b63c6b..31bf37da4 100644 --- a/Assets/prefabs/spine/ui/characters/p0004.prefab +++ b/Assets/prefabs/spine/ui/characters/p0004.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2951863086470196126} - - component: {fileID: 8461816611910563255} + - component: {fileID: -6083284349890068408} m_Layer: 5 m_Name: p0004 m_TagString: Untagged @@ -37,7 +37,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8461816611910563255 +--- !u!114 &-6083284349890068408 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 8971105fe15cca6418600cd90f0c1885, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0004.prefab.meta b/Assets/prefabs/spine/ui/characters/p0004.prefab.meta index 40806722f..bd9486361 100644 --- a/Assets/prefabs/spine/ui/characters/p0004.prefab.meta +++ b/Assets/prefabs/spine/ui/characters/p0004.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f64ee7bf47d7bb44495b566c1332d000 +guid: 5cea701bc5845d844974a16806170301 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/prefabs/spine/ui/characters/p0005.prefab b/Assets/prefabs/spine/ui/characters/p0005.prefab index 692cbbdb1..91c75253d 100644 --- a/Assets/prefabs/spine/ui/characters/p0005.prefab +++ b/Assets/prefabs/spine/ui/characters/p0005.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2951863086470196126} - - component: {fileID: 7133076566514900466} + - component: {fileID: -6083284349890068408} m_Layer: 5 m_Name: p0005 m_TagString: Untagged @@ -37,7 +37,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7133076566514900466 +--- !u!114 &-6083284349890068408 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: bc595672e1cc40d46a31a9316608dbc2, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0005.prefab.meta b/Assets/prefabs/spine/ui/characters/p0005.prefab.meta index 0e15316d0..4b34cc40c 100644 --- a/Assets/prefabs/spine/ui/characters/p0005.prefab.meta +++ b/Assets/prefabs/spine/ui/characters/p0005.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a6557d5988e5034a9d493bf5acccfd6 +guid: a1a375f6f2f18f74bae1cfe60054de3f PrefabImporter: externalObjects: {} userData: diff --git a/Assets/prefabs/spine/ui/characters/p0006.prefab b/Assets/prefabs/spine/ui/characters/p0006.prefab index affb671e4..1d880ee33 100644 --- a/Assets/prefabs/spine/ui/characters/p0006.prefab +++ b/Assets/prefabs/spine/ui/characters/p0006.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2951863086470196126} - - component: {fileID: -2710866854134004103} + - component: {fileID: -6083284349890068408} m_Layer: 5 m_Name: p0006 m_TagString: Untagged @@ -37,7 +37,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &-2710866854134004103 +--- !u!114 &-6083284349890068408 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -49,8 +49,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 490f47ff5874f0347bc783903bad2e72, type: 3} m_Name: m_EditorClassIdentifier: - SpineObject: {fileID: 0} - ObjectList: [] + SpineObject: {fileID: 8900387906475466617} + ObjectList: + - hashName: 3029410 + gameObject: {fileID: 4116628536935411962} + - hashName: 3506402 + gameObject: {fileID: 8900387906475466617} --- !u!1 &4116628536935411962 GameObject: m_ObjectHideFlags: 0 @@ -152,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: f6e6257b1c7265d4a9d9b1cb25b503a0, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0006.prefab.meta b/Assets/prefabs/spine/ui/characters/p0006.prefab.meta index 869bd9f11..691ea543b 100644 --- a/Assets/prefabs/spine/ui/characters/p0006.prefab.meta +++ b/Assets/prefabs/spine/ui/characters/p0006.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afc33244ea002764884724e0f19749e6 +guid: 6239eeb2ede6cae45b6862e98760cd8c PrefabImporter: externalObjects: {} userData: diff --git a/Assets/prefabs/spine/ui/characters/p0007.prefab b/Assets/prefabs/spine/ui/characters/p0007.prefab index 4565cd19b..d287d6570 100644 --- a/Assets/prefabs/spine/ui/characters/p0007.prefab +++ b/Assets/prefabs/spine/ui/characters/p0007.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2951863086470196126} - - component: {fileID: 6012233684727656930} + - component: {fileID: -6083284349890068408} m_Layer: 5 m_Name: p0007 m_TagString: Untagged @@ -37,7 +37,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6012233684727656930 +--- !u!114 &-6083284349890068408 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: 8daf66d8ab058c64b96e8e9c6e023af3, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0007.prefab.meta b/Assets/prefabs/spine/ui/characters/p0007.prefab.meta index 2366017d7..8e1ba61eb 100644 --- a/Assets/prefabs/spine/ui/characters/p0007.prefab.meta +++ b/Assets/prefabs/spine/ui/characters/p0007.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8409a198deb9b81408c3ae3192690181 +guid: c94ceec733494cb49be5949cad4d1b2d PrefabImporter: externalObjects: {} userData: diff --git a/Assets/prefabs/spine/ui/characters/p0008.prefab b/Assets/prefabs/spine/ui/characters/p0008.prefab index 0d745cd9f..1a14584df 100644 --- a/Assets/prefabs/spine/ui/characters/p0008.prefab +++ b/Assets/prefabs/spine/ui/characters/p0008.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2951863086470196126} - - component: {fileID: 1305262523741013456} + - component: {fileID: -6083284349890068408} m_Layer: 5 m_Name: p0008 m_TagString: Untagged @@ -37,7 +37,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1305262523741013456 +--- !u!114 &-6083284349890068408 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: b6d8c6b0030162a48a34647cd8c3da4a, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 1c7297de721c6b84b8cb96644f5fd288, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/p0008.prefab.meta b/Assets/prefabs/spine/ui/characters/p0008.prefab.meta index 8997d8206..8486af146 100644 --- a/Assets/prefabs/spine/ui/characters/p0008.prefab.meta +++ b/Assets/prefabs/spine/ui/characters/p0008.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 096fdbeda1c04934f86513e522f98036 +guid: 7fa04e867bc25034d98cbadbb50aa978 PrefabImporter: externalObjects: {} userData: