diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.atlas.txt b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.atlas.txt index 06527c597..eb716244b 100755 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.atlas.txt +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.atlas.txt @@ -1,7 +1,7 @@ -ui_battle_yan.png -size:128,128 -filter:Linear,Linear -yan1 -bounds:2,2,47,47 -yan2 -bounds:2,51,81,74 +ui_battle_yan.png +size:128,128 +filter:Linear,Linear +yan1 +bounds:2,2,47,47 +yan2 +bounds:2,51,81,74 diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.atlas.txt.meta b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.atlas.txt.meta index b41050972..e6332fd9c 100755 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.atlas.txt.meta @@ -1,7 +1,7 @@ -fileFormatVersion: 2 -guid: 797fb3379c2518f4cbe95bacbadad33a -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: arts/spines/ui/ui_battle_yan.ab - assetBundleVariant: +fileFormatVersion: 2 +guid: 797fb3379c2518f4cbe95bacbadad33a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.png.meta b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.png.meta index a5e767df3..8ab886454 100755 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.png.meta +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.png.meta @@ -89,18 +89,6 @@ 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 - serializedVersion: 3 buildTarget: Android 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/ui/ui_battle_yan.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.skel.bytes b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.skel.bytes index 882a42a14..c91344b62 100755 Binary files a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.skel.bytes and b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.skel.bytes.meta b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.skel.bytes.meta index 3116b2a10..6cfe68378 100755 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan.skel.bytes.meta @@ -1,7 +1,7 @@ -fileFormatVersion: 2 -guid: 8d9654de4eb07ba4abbc52a82873dd76 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: arts/spines/ui/ui_battle_yan.ab - assetBundleVariant: +fileFormatVersion: 2 +guid: 8d9654de4eb07ba4abbc52a82873dd76 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_atlas.asset.meta b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_atlas.asset.meta index e79fbeb93..e27f7ee73 100755 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_atlas.asset.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 1961402d26ff8a94e9593a0e1ceb9352 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: arts/spines/ui/ui_battle_yan.ab - assetBundleVariant: +fileFormatVersion: 2 +guid: 1961402d26ff8a94e9593a0e1ceb9352 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_material.mat b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_material.mat index dc1e173a9..0b69b099c 100644 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_material.mat +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_battle_yan_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,7 +40,7 @@ Material: - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - - _glow_color: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_material.mat.meta b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_material.mat.meta index d7a61b82e..bd45d82ee 100755 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_material.mat.meta +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_material.mat.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 2e048f46be58ec74cb78de24a2552582 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: arts/spines/ui/ui_battle_yan.ab - assetBundleVariant: +fileFormatVersion: 2 +guid: 2e048f46be58ec74cb78de24a2552582 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_skeletondata.asset b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_skeletondata.asset index bbf3ac14e..5fcbc7e5b 100755 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_skeletondata.asset.meta index 5401c812e..a0ae7b504 100755 --- a/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_battle_yan/ui_battle_yan_skeletondata.asset.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: 5bf0bac615870694bae2be1661b25535 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: arts/spines/ui/ui_battle_yan.ab - assetBundleVariant: +fileFormatVersion: 2 +guid: 5bf0bac615870694bae2be1661b25535 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up.atlas.txt.meta b/Assets/arts/spines/ui/ui_card_up/ui_card_up.atlas.txt.meta index 4ec8b957b..cadab0e4a 100644 --- a/Assets/arts/spines/ui/ui_card_up/ui_card_up.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_card_up/ui_card_up.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 18e858c42a56c0148b75c75c868ea710 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_card_up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up.png b/Assets/arts/spines/ui/ui_card_up/ui_card_up.png index 79163c49e..c1134246b 100644 Binary files a/Assets/arts/spines/ui/ui_card_up/ui_card_up.png and b/Assets/arts/spines/ui/ui_card_up/ui_card_up.png differ diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up.png.meta b/Assets/arts/spines/ui/ui_card_up/ui_card_up.png.meta index 14d76c11b..311d53c7d 100644 --- a/Assets/arts/spines/ui/ui_card_up/ui_card_up.png.meta +++ b/Assets/arts/spines/ui/ui_card_up/ui_card_up.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,32 @@ 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: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: iPhone 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/ui/ui_card_up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up.skel.bytes b/Assets/arts/spines/ui/ui_card_up/ui_card_up.skel.bytes index 4c24d48a6..4ff22363d 100644 Binary files a/Assets/arts/spines/ui/ui_card_up/ui_card_up.skel.bytes and b/Assets/arts/spines/ui/ui_card_up/ui_card_up.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up.skel.bytes.meta b/Assets/arts/spines/ui/ui_card_up/ui_card_up.skel.bytes.meta index 3d9318b53..cbf18e64c 100644 --- a/Assets/arts/spines/ui/ui_card_up/ui_card_up.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_card_up/ui_card_up.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 8a39168a19c61ab42944845131dd9e22 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_card_up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up_atlas.asset.meta b/Assets/arts/spines/ui/ui_card_up/ui_card_up_atlas.asset.meta index b5f8f2004..8d633a884 100644 --- a/Assets/arts/spines/ui/ui_card_up/ui_card_up_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_card_up/ui_card_up_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_card_up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up_material.mat b/Assets/arts/spines/ui/ui_card_up/ui_card_up_material.mat index 90cd79617..a280031d0 100644 --- a/Assets/arts/spines/ui/ui_card_up/ui_card_up_material.mat +++ b/Assets/arts/spines/ui/ui_card_up/ui_card_up_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_card_up_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/ui/ui_card_up/ui_card_up_material.mat.meta b/Assets/arts/spines/ui/ui_card_up/ui_card_up_material.mat.meta index dcb2b7f48..d02d3191f 100644 --- a/Assets/arts/spines/ui/ui_card_up/ui_card_up_material.mat.meta +++ b/Assets/arts/spines/ui/ui_card_up/ui_card_up_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_card_up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up_skeletondata.asset b/Assets/arts/spines/ui/ui_card_up/ui_card_up_skeletondata.asset index 1679479e7..cd7ce1e96 100644 --- a/Assets/arts/spines/ui/ui_card_up/ui_card_up_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_card_up/ui_card_up_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_card_up/ui_card_up_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_card_up/ui_card_up_skeletondata.asset.meta index c16d5b803..fc4f07f81 100644 --- a/Assets/arts/spines/ui/ui_card_up/ui_card_up_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_card_up/ui_card_up_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_card_up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.atlas.txt.meta b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.atlas.txt.meta index 5bc05c0a4..e2065d98e 100644 --- a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.atlas.txt.meta @@ -3,5 +3,5 @@ guid: df7f11f9232303e489321323d7cd823c TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_blue.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.png.meta b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.png.meta index a8a71f13d..6e1c9207d 100644 --- a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.png.meta +++ b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.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,32 @@ 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: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: iPhone 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/ui/ui_hero_blue.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.skel.bytes b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.skel.bytes index 6a4cae991..e634406a3 100644 Binary files a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.skel.bytes and b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.skel.bytes.meta b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.skel.bytes.meta index 873146d5a..2dc006eb7 100644 --- a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue.skel.bytes.meta @@ -3,5 +3,5 @@ guid: a320905aab74cc746807a12dba39e4b8 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_blue.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_atlas.asset.meta b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_atlas.asset.meta index 79945b485..288fbb73b 100644 --- a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_blue.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_material.mat b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_material.mat index bdea35dd8..2a7831203 100644 --- a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_material.mat +++ b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_hero_blue_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/ui/ui_hero_blue/ui_hero_blue_material.mat.meta b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_material.mat.meta index 4a109a420..64543c704 100644 --- a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_material.mat.meta +++ b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_hero_blue.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_skeletondata.asset.meta index cd50514e0..9098fecef 100644 --- a/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_blue/ui_hero_blue_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_blue.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.atlas.txt.meta b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.atlas.txt.meta index 606b973fb..c74c39066 100644 --- a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.atlas.txt.meta @@ -3,5 +3,5 @@ guid: c584ffe034161c943beb2bb6531a06d3 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_green.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.png.meta b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.png.meta index b19b96e72..812e732cc 100644 --- a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.png.meta +++ b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.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,32 @@ 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: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: iPhone 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/ui/ui_hero_green.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.skel.bytes b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.skel.bytes index 9397842f3..e0b0e3974 100644 Binary files a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.skel.bytes and b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.skel.bytes.meta b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.skel.bytes.meta index 72d7b48fd..b9e21b3ce 100644 --- a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 6b7a749fce9160a469c15c053aa52ae2 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_green.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_atlas.asset.meta b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_atlas.asset.meta index 5715efcba..41d74eccf 100644 --- a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_green.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_material.mat b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_material.mat index fae9765ca..a411dc407 100644 --- a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_material.mat +++ b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_hero_green_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/ui/ui_hero_green/ui_hero_green_material.mat.meta b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_material.mat.meta index a9c1b522e..1b7c444ea 100644 --- a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_material.mat.meta +++ b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_hero_green.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_skeletondata.asset.meta index 276fe2064..0e7561eac 100644 --- a/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_green/ui_hero_green_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_green.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.atlas.txt.meta b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.atlas.txt.meta index 7af146b35..88b0dba9f 100644 --- a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 00f5187e4f30cc647ad5f44e0aacaa99 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_purple.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.png.meta b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.png.meta index 7b0b953a0..5f8bb0c49 100644 --- a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.png.meta +++ b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.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,32 @@ 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: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: iPhone 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/ui/ui_hero_purple.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.skel.bytes b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.skel.bytes index 788ac037a..a7054133d 100644 Binary files a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.skel.bytes and b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.skel.bytes.meta b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.skel.bytes.meta index f7d690aee..89bc34a7f 100644 --- a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 564dd3075b720f54eb0991ea889a1630 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_purple.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_atlas.asset.meta b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_atlas.asset.meta index 38c10d3b1..d63606f1b 100644 --- a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_purple.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_material.mat b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_material.mat index a17ac8068..a41918cac 100644 --- a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_material.mat +++ b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_hero_purple_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/ui/ui_hero_purple/ui_hero_purple_material.mat.meta b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_material.mat.meta index bfd80f08a..287219d47 100644 --- a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_material.mat.meta +++ b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_hero_purple.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_skeletondata.asset b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_skeletondata.asset index 9b9d21e19..38b82cc4b 100644 --- a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_skeletondata.asset.meta index 7ea133520..e0a6cda07 100644 --- a/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_purple/ui_hero_purple_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_purple.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.atlas.txt.meta b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.atlas.txt.meta index 4ee86489f..3a079a3e4 100644 --- a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.atlas.txt.meta @@ -3,5 +3,5 @@ guid: ef65cee5feb721a43a2793c4c8368158 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_red.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.png.meta b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.png.meta index 69442213d..d974919cf 100644 --- a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.png.meta +++ b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.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,32 @@ 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: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: iPhone 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/ui/ui_hero_red.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.skel.bytes b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.skel.bytes index 719f51a99..631848265 100644 Binary files a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.skel.bytes and b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.skel.bytes.meta b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.skel.bytes.meta index 9fa0d3fc2..83ea43283 100644 --- a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red.skel.bytes.meta @@ -3,5 +3,5 @@ guid: e36e53f2e8736a04b8c08ed165eea338 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_red.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_atlas.asset.meta b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_atlas.asset.meta index 6acf640d2..9d04fe9b2 100644 --- a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_red.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_material.mat b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_material.mat index 02f76b74e..a7d754164 100644 --- a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_material.mat +++ b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_hero_red_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/ui/ui_hero_red/ui_hero_red_material.mat.meta b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_material.mat.meta index ecaf221a9..2bd3076c3 100644 --- a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_material.mat.meta +++ b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_hero_red.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_skeletondata.asset b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_skeletondata.asset index 298885497..b92e21af5 100644 --- a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_skeletondata.asset.meta index 48d773790..73fdecf74 100644 --- a/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_red/ui_hero_red_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_red.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.atlas.txt.meta b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.atlas.txt.meta index fec73df2b..082855f5b 100644 --- a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 3d70bc91784cc8c41b6025891186d042 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_yellow.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.png.meta b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.png.meta index 2c1241214..24bf69664 100644 --- a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.png.meta +++ b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.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,32 @@ 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: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: iPhone 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/ui/ui_hero_yellow.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.skel.bytes b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.skel.bytes index 35dce68c0..917bd62ad 100644 Binary files a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.skel.bytes and b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.skel.bytes.meta b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.skel.bytes.meta index b5d55dae0..f9fcd836f 100644 --- a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 508b384cbcd6d294bbaf0bcc15f4d030 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_hero_yellow.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_atlas.asset.meta b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_atlas.asset.meta index c453b8b25..60ca86291 100644 --- a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_yellow.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_material.mat b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_material.mat index 9fdf35aec..fa6dbe4af 100644 --- a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_material.mat +++ b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_hero_yellow_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/ui/ui_hero_yellow/ui_hero_yellow_material.mat.meta b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_material.mat.meta index fe1a937b9..9f414597a 100644 --- a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_material.mat.meta +++ b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_hero_yellow.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_skeletondata.asset b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_skeletondata.asset index 049a1422d..3cec9325f 100644 --- a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_skeletondata.asset.meta index 28b786593..f76ef463c 100644 --- a/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_hero_yellow/ui_hero_yellow_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_hero_yellow.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt index fd4378161..32f90e685 100644 --- a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt @@ -2,17 +2,16 @@ ui_main_btn_bounty.png size:512,512 filter:Linear,Linear 2 -bounds:1,304,16,17 +bounds:2,303,16,17 offsets:1,1,18,19 3 -bounds:484,486,25,27 +bounds:485,483,25,27 offsets:1,1,27,29 -rotate:90 4 -bounds:449,475,33,36 +bounds:450,474,33,36 offsets:1,1,35,38 5 -bounds:1,323,247,90 +bounds:2,322,247,90 offsets:1,1,249,92 6 -bounds:1,415,446,96 +bounds:2,414,446,96 diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt.meta index 7ab71673d..99661cff6 100644 --- a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 80a3b882f366818468ae31846837f6d0 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_main_btn_bounty.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png index 6f293d81d..19d5f7d48 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png and b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png.meta index b3a58ae53..966f3b71f 100644 --- a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.png.meta +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.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,32 @@ 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: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: iPhone 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/ui/ui_main_btn_bounty.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes index bae215ef2..378273fe5 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes and b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes.meta index 7fd10da1b..78581da00 100644 --- a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty.skel.bytes.meta @@ -3,5 +3,5 @@ guid: fc48b350677b9334283a8b43d62166a1 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_main_btn_bounty.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset.meta index d5345a1fd..efc39cb35 100644 --- a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_main_btn_bounty.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat index a740988b9..02a6511e8 100644 --- a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_bounty_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/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat.meta index ebdc88824..56d76c79e 100644 --- a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat.meta +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_main_btn_bounty.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset.meta index f42b8c085..36df4dca4 100644 --- a/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_main_btn_bounty/ui_main_btn_bounty_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_main_btn_bounty.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt index c8c3e6a00..7c77174d8 100644 --- a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt @@ -2,9 +2,10 @@ ui_main_chest.png size:128,128 filter:Linear,Linear bx1 -bounds:2,57,70,66 +bounds:2,67,63,59 bx2 -bounds:2,2,70,53 +bounds:2,2,63,47 +rotate:90 xx -bounds:74,77,46,46 +bounds:67,80,46,46 offsets:9,9,64,64 diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt.meta index 3efa2923f..9037702f1 100644 --- a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 27d4b6cfea43a2d43bdfa63f791bafc4 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_main_chest.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.png b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.png index 4cff1ae03..a0668bdd4 100644 Binary files a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.png and b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.png differ diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.png.meta b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.png.meta index ef6cb79d8..98177c1dd 100644 --- a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.png.meta +++ b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.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,32 @@ 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: Android maxTextureSize: 2048 @@ -89,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: iPhone 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/ui/ui_main_chest.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.skel.bytes b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.skel.bytes index f14a3f0ed..bb7b79658 100644 Binary files a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.skel.bytes and b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.skel.bytes.meta index fe19539ea..3d10c7e50 100644 --- a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 130d9b1cf762b6145807001ba2c62e79 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_main_chest.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_atlas.asset.meta index 506ac789e..fb28f7555 100644 --- a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_main_chest.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_material.mat b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_material.mat index 22452f17c..70a027023 100644 --- a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_material.mat +++ b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_main_chest_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/ui/ui_main_chest/ui_main_chest_material.mat.meta b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_material.mat.meta index 6698bea4f..f928da638 100644 --- a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_material.mat.meta +++ b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_main_chest.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_skeletondata.asset.meta index 9fe00d202..6d9372d55 100644 --- a/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_main_chest/ui_main_chest_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_main_chest.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_wave.meta b/Assets/arts/spines/ui/ui_main_wave.meta new file mode 100644 index 000000000..e8e34ae10 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_wave.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb681ba83dc83b8458509916b2551ecb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.atlas.txt b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.atlas.txt similarity index 100% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.atlas.txt rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave.atlas.txt diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.atlas.txt.meta similarity index 52% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.atlas.txt.meta rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave.atlas.txt.meta index 30fa937a4..7610471be 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.atlas.txt.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 2ebebe39def94ce4598300188564ae83 +guid: 22d5d6b771bfbf0479d6df665f24ffd8 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_mian_wave.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.png b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.png similarity index 100% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.png rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave.png diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.png.meta b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.png.meta similarity index 96% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.png.meta rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave.png.meta index 9498c01b7..d1eb38747 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.png.meta +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8aaba33c067534e47b88ac4253ce4ee9 +guid: 5128267c6f0ddca4e8094a08a4ad5982 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -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/ui/ui_mian_wave.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.skel.bytes b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.skel.bytes new file mode 100644 index 000000000..d730cfc70 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.skel.bytes.meta similarity index 52% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.skel.bytes.meta rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave.skel.bytes.meta index 66860ecd6..b8b9bbc86 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave.skel.bytes.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 17c5cf845eed20845a75a1153a4a372a +guid: 716f6fece27b12941857aa94c1e32e24 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_mian_wave.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_atlas.asset b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_atlas.asset similarity index 77% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_atlas.asset rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave_atlas.asset index 46a59d35d..a17a553d0 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_atlas.asset +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_atlas.asset @@ -14,6 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 2ebebe39def94ce4598300188564ae83, type: 3} + atlasFile: {fileID: 4900000, guid: 22d5d6b771bfbf0479d6df665f24ffd8, type: 3} materials: - - {fileID: 2100000, guid: 293c80d3fbb0af64a989146e4de4e1ce, type: 2} + - {fileID: 2100000, guid: 041dd20ec428f2343a435ccf0d8652ba, type: 2} diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_atlas.asset.meta similarity index 59% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_atlas.asset.meta rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave_atlas.asset.meta index 7d79a56f2..9f82c4ced 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_atlas.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 0afa173ebe7066b4f9629a6db4974618 +guid: e1659eb110541f3438da061cb461675c NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_mian_wave.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_material.mat b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_material.mat similarity index 82% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_material.mat rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave_material.mat index 54850ff94..195e51d9c 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_material.mat +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ui_main_wave_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: @@ -23,12 +23,13 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 8aaba33c067534e47b88ac4253ce4ee9, type: 3} + m_Texture: {fileID: 2800000, guid: 5128267c6f0ddca4e8094a08a4ad5982, 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 @@ -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/ui/ui_mian_wave/ui_main_wave_material.mat.meta b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_material.mat.meta similarity index 59% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_material.mat.meta rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave_material.mat.meta index b5a36c161..f46e2e2dd 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_material.mat.meta +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_material.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 293c80d3fbb0af64a989146e4de4e1ce +guid: 041dd20ec428f2343a435ccf0d8652ba NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_mian_wave.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_skeletondata.asset b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_skeletondata.asset similarity index 84% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_skeletondata.asset rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave_skeletondata.asset index 68149a2b2..5b098f581 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_skeletondata.asset @@ -13,9 +13,9 @@ MonoBehaviour: m_Name: ui_main_wave_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 0afa173ebe7066b4f9629a6db4974618, type: 2} + - {fileID: 11400000, guid: e1659eb110541f3438da061cb461675c, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 17c5cf845eed20845a75a1153a4a372a, type: 3} + skeletonJSON: {fileID: 4900000, guid: 716f6fece27b12941857aa94c1e32e24, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_skeletondata.asset.meta similarity index 59% rename from Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_skeletondata.asset.meta rename to Assets/arts/spines/ui/ui_main_wave/ui_main_wave_skeletondata.asset.meta index d0b13e64f..836bcb00d 100644 --- a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_main_wave/ui_main_wave_skeletondata.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 5db6ac4e2946d7b4dab81fcf173a9f48 +guid: f3abbf41482a72d4e838d79d284c2a05 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_mian_wave.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.skel.bytes b/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.skel.bytes deleted file mode 100644 index 1ec54a595..000000000 Binary files a/Assets/arts/spines/ui/ui_mian_wave/ui_main_wave.skel.bytes and /dev/null differ