diff --git a/Assets/arts/spines/characters/m10059/m10049.atlas.txt b/Assets/arts/spines/characters/m10059/m10059.atlas.txt similarity index 98% rename from Assets/arts/spines/characters/m10059/m10049.atlas.txt rename to Assets/arts/spines/characters/m10059/m10059.atlas.txt index 860e82712..8aac0676b 100644 --- a/Assets/arts/spines/characters/m10059/m10049.atlas.txt +++ b/Assets/arts/spines/characters/m10059/m10059.atlas.txt @@ -1,4 +1,4 @@ -m10049.png +m10059.png size:512,512 filter:Linear,Linear eye_xuanyun diff --git a/Assets/arts/spines/characters/m10059/m10049.skel.bytes.meta b/Assets/arts/spines/characters/m10059/m10059.atlas.txt.meta similarity index 52% rename from Assets/arts/spines/characters/m10059/m10049.skel.bytes.meta rename to Assets/arts/spines/characters/m10059/m10059.atlas.txt.meta index d64ca191a..f7ddbc00e 100644 --- a/Assets/arts/spines/characters/m10059/m10049.skel.bytes.meta +++ b/Assets/arts/spines/characters/m10059/m10059.atlas.txt.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 263944e8bd2c2c34d82e48d5e25bf8cc +guid: 85c61cbb65ac46d40a7a61650b6d298f TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10059.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10059/m10049.png b/Assets/arts/spines/characters/m10059/m10059.png similarity index 100% rename from Assets/arts/spines/characters/m10059/m10049.png rename to Assets/arts/spines/characters/m10059/m10059.png diff --git a/Assets/arts/spines/characters/m10059/m10049.png.meta b/Assets/arts/spines/characters/m10059/m10059.png.meta similarity index 82% rename from Assets/arts/spines/characters/m10059/m10049.png.meta rename to Assets/arts/spines/characters/m10059/m10059.png.meta index 86fcb94cb..cdd0b751b 100644 --- a/Assets/arts/spines/characters/m10059/m10049.png.meta +++ b/Assets/arts/spines/characters/m10059/m10059.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e232921d2de2cd045aaf2d35ddb03eb5 +guid: f83d66476975ea74fb1a874cc85e84c8 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -35,9 +35,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -68,25 +68,13 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 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 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -128,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m10059.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10059/m10049.skel.bytes b/Assets/arts/spines/characters/m10059/m10059.skel.bytes similarity index 93% rename from Assets/arts/spines/characters/m10059/m10049.skel.bytes rename to Assets/arts/spines/characters/m10059/m10059.skel.bytes index 95905f430..fa2e768ae 100644 Binary files a/Assets/arts/spines/characters/m10059/m10049.skel.bytes and b/Assets/arts/spines/characters/m10059/m10059.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10059/m10049.atlas.txt.meta b/Assets/arts/spines/characters/m10059/m10059.skel.bytes.meta similarity index 52% rename from Assets/arts/spines/characters/m10059/m10049.atlas.txt.meta rename to Assets/arts/spines/characters/m10059/m10059.skel.bytes.meta index 8b9b97273..5225accdf 100644 --- a/Assets/arts/spines/characters/m10059/m10049.atlas.txt.meta +++ b/Assets/arts/spines/characters/m10059/m10059.skel.bytes.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 3e202069859248a4fba3dffc2cd84bc6 +guid: dd474657e66ec064187d54222c84bb05 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m10059.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10059/m10049_atlas.asset b/Assets/arts/spines/characters/m10059/m10059_atlas.asset similarity index 70% rename from Assets/arts/spines/characters/m10059/m10049_atlas.asset rename to Assets/arts/spines/characters/m10059/m10059_atlas.asset index 98d8888b8..926977b01 100644 --- a/Assets/arts/spines/characters/m10059/m10049_atlas.asset +++ b/Assets/arts/spines/characters/m10059/m10059_atlas.asset @@ -10,8 +10,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: m10049_atlas + m_Name: m10059_atlas m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: 3e202069859248a4fba3dffc2cd84bc6, type: 3} + atlasFile: {fileID: 4900000, guid: 85c61cbb65ac46d40a7a61650b6d298f, type: 3} materials: - - {fileID: 2100000, guid: 4743060dc34599a43a2b2fae9f75283a, type: 2} + - {fileID: 2100000, guid: aac33a5ccc48d6d4bad24fc8ac9d569d, type: 2} diff --git a/Assets/arts/spines/characters/m10059/m10049_skeletondata.asset.meta b/Assets/arts/spines/characters/m10059/m10059_atlas.asset.meta similarity index 58% rename from Assets/arts/spines/characters/m10059/m10049_skeletondata.asset.meta rename to Assets/arts/spines/characters/m10059/m10059_atlas.asset.meta index 5169d1ad8..4f89a3396 100644 --- a/Assets/arts/spines/characters/m10059/m10049_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m10059/m10059_atlas.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c46a7058795934d439c61762f0eab1a8 +guid: 4964b15747f876845b9ac6e644d23417 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10059.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10059/m10049_material.mat b/Assets/arts/spines/characters/m10059/m10059_material.mat similarity index 90% rename from Assets/arts/spines/characters/m10059/m10049_material.mat rename to Assets/arts/spines/characters/m10059/m10059_material.mat index 1fb283bdf..e6653d680 100644 --- a/Assets/arts/spines/characters/m10059/m10049_material.mat +++ b/Assets/arts/spines/characters/m10059/m10059_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: m10049_material + m_Name: m10059_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -20,7 +20,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: e232921d2de2cd045aaf2d35ddb03eb5, type: 3} + m_Texture: {fileID: 2800000, guid: f83d66476975ea74fb1a874cc85e84c8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/arts/spines/characters/m10059/m10049_material.mat.meta b/Assets/arts/spines/characters/m10059/m10059_material.mat.meta similarity index 58% rename from Assets/arts/spines/characters/m10059/m10049_material.mat.meta rename to Assets/arts/spines/characters/m10059/m10059_material.mat.meta index 84182d75b..d52732724 100644 --- a/Assets/arts/spines/characters/m10059/m10049_material.mat.meta +++ b/Assets/arts/spines/characters/m10059/m10059_material.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 4743060dc34599a43a2b2fae9f75283a +guid: aac33a5ccc48d6d4bad24fc8ac9d569d NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m10059.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m10059/m10049_skeletondata.asset b/Assets/arts/spines/characters/m10059/m10059_skeletondata.asset similarity index 80% rename from Assets/arts/spines/characters/m10059/m10049_skeletondata.asset rename to Assets/arts/spines/characters/m10059/m10059_skeletondata.asset index 97b1147d5..9f7ca4d64 100644 --- a/Assets/arts/spines/characters/m10059/m10049_skeletondata.asset +++ b/Assets/arts/spines/characters/m10059/m10059_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: m10049_skeletondata + m_Name: m10059_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 03cf955fae7c20447b40aed835b96bf3, type: 2} + - {fileID: 11400000, guid: 4964b15747f876845b9ac6e644d23417, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 263944e8bd2c2c34d82e48d5e25bf8cc, type: 3} + skeletonJSON: {fileID: 4900000, guid: dd474657e66ec064187d54222c84bb05, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/arts/spines/characters/m10059/m10049_atlas.asset.meta b/Assets/arts/spines/characters/m10059/m10059_skeletondata.asset.meta similarity index 58% rename from Assets/arts/spines/characters/m10059/m10049_atlas.asset.meta rename to Assets/arts/spines/characters/m10059/m10059_skeletondata.asset.meta index df78dec8a..1508409cc 100644 --- a/Assets/arts/spines/characters/m10059/m10049_atlas.asset.meta +++ b/Assets/arts/spines/characters/m10059/m10059_skeletondata.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 03cf955fae7c20447b40aed835b96bf3 +guid: 107edbe614148b74482aa67db41c3975 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m10059.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/spine/ui/characters/m10059.prefab b/Assets/prefabs/spine/ui/characters/m10059.prefab index 08978b1ab..89097595c 100644 --- a/Assets/prefabs/spine/ui/characters/m10059.prefab +++ b/Assets/prefabs/spine/ui/characters/m10059.prefab @@ -156,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: c46a7058795934d439c61762f0eab1a8, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 107edbe614148b74482aa67db41c3975, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0}