diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.png b/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.png deleted file mode 100644 index 883941f0d..000000000 Binary files a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.png and /dev/null differ diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.skel.bytes b/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.skel.bytes deleted file mode 100644 index 9c790bce2..000000000 Binary files a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.skel.bytes and /dev/null differ diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.atlas.txt b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.atlas.txt similarity index 67% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui.atlas.txt rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match.atlas.txt index 33605d37a..4b4e2424c 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.atlas.txt +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.atlas.txt @@ -1,64 +1,63 @@ -arena_match_ui.png +ui_arena_match.png size:2048,2048 filter:Linear,Linear scale:1.7 Simpl Cartoon Flash FX Elements Pack 20 Color_00000 -bounds:220,429,510,139 +bounds:1536,1096,510,139 offsets:0,68,510,287 -rotate:90 Simpl Cartoon Flash FX Elements Pack 20 Color_00001 -bounds:361,521,510,139 +bounds:1536,955,510,139 offsets:0,68,510,287 -rotate:90 Simpl Cartoon Flash FX Elements Pack 20 Color_00002 -bounds:1884,1533,510,158 +bounds:1024,1077,510,158 offsets:0,56,510,287 -rotate:90 Simpl Cartoon Flash FX Elements Pack 20 Color_00003 -bounds:860,1440,510,192 +bounds:1536,1237,510,192 offsets:0,21,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00007 -bounds:786,1064,510,185 +bounds:2,194,510,185 offsets:0,33,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00008 -bounds:2,429,510,216 +bounds:2,570,510,216 offsets:0,22,510,287 -rotate:90 Simpl Cartoon Flash FX Elements Pack 20 Color_00009 -bounds:274,1239,510,216 +bounds:1024,1830,510,216 offsets:0,22,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00010 -bounds:1372,1452,510,187 +bounds:1024,1237,510,187 offsets:0,56,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00011 -bounds:786,1251,510,187 +bounds:2,381,510,187 offsets:0,56,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00012 -bounds:274,1033,510,204 +bounds:1536,1634,510,204 offsets:0,48,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00013 -bounds:860,1837,510,206 +bounds:1536,1840,510,206 offsets:0,42,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00014 -bounds:1372,1641,510,199 +bounds:1024,1426,510,199 offsets:0,44,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00015 -bounds:860,1634,510,201 +bounds:1024,1627,510,201 offsets:0,49,510,287 Simpl Cartoon Flash FX Elements Pack 20 Color_00016 -bounds:1372,1842,510,201 +bounds:1536,1431,510,201 offsets:0,49,510,287 -g2 -bounds:274,1457,584,586 -offsets:50,44,680,680 g3 -bounds:2,2,425,271 +bounds:514,515,425,271 offsets:5,84,435,435 -rotate:90 +gd-hbimg-05 +bounds:2,1060,1020,986 +offsets:163,122,1224,1224 gg2 -bounds:2,941,270,1102 +bounds:2,788,270,1102 offsets:143,294,547,1700 +rotate:90 s -bounds:502,548,158,221 +bounds:941,567,158,219 v -bounds:502,771,173,260 +bounds:514,255,172,258 +xx +bounds:2,12,184,180 +offsets:5,10,199,199 diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.skel.bytes.meta b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.atlas.txt.meta similarity index 75% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui.skel.bytes.meta rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match.atlas.txt.meta index 348f0edb0..2ba4b0069 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 03f29b083ae631f4f9e5fc4ceb91cdf0 +guid: 63dcb96a3c3560f4ea5039d9d62343f6 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.png b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.png new file mode 100644 index 000000000..727e2eb60 Binary files /dev/null and b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.png.meta b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.png.meta similarity index 98% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.png.meta rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match.png.meta index a32116dae..1472afbc9 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.png.meta +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2fb06227c5f734577a2bb75760580292 +guid: 18f07ea93081e22419ee82d32408dd4a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -90,17 +90,17 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 - buildTarget: iPhone + buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 + textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -114,17 +114,17 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Server + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 50 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.skel.bytes b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.skel.bytes new file mode 100644 index 000000000..401b40c0e Binary files /dev/null and b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.atlas.txt.meta b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.skel.bytes.meta similarity index 75% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui.atlas.txt.meta rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match.skel.bytes.meta index 66756da91..8d95cb305 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a7e557fcbe72e34a9d494fc4f85a388 +guid: 9610bd88f4fd499478aad29fa3e24800 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_atlas.asset b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_atlas.asset similarity index 72% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui_atlas.asset rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match_atlas.asset index b98222ba4..200d411e0 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_atlas.asset +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: arena_match_ui_atlas + m_Name: ui_arena_match_atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 0a7e557fcbe72e34a9d494fc4f85a388, type: 3} + atlasFile: {fileID: 4900000, guid: 63dcb96a3c3560f4ea5039d9d62343f6, type: 3} materials: - - {fileID: 2100000, guid: d73755b6d7ee35a4cb5eac6d6febd8c7, type: 2} + - {fileID: 2100000, guid: ed245144e5b03174894bd81f6a291d99, type: 2} diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_atlas.asset.meta similarity index 79% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui_skeletondata.asset.meta rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match_atlas.asset.meta index 8802b3e23..462a3ec01 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c99806828e2f03a4ba15821e5ab32eda +guid: 953bb593ec85c674eb77251d01d7cf0e NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_material.mat b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_material.mat similarity index 90% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui_material.mat rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match_material.mat index b38daf7ff..a538e3112 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_material.mat +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: arena_match_ui_material + m_Name: ui_arena_match_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT @@ -23,7 +23,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 206eb88d891bc2c43b300ce5c1394f5a, type: 3} + m_Texture: {fileID: 2800000, guid: 18f07ea93081e22419ee82d32408dd4a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_material.mat.meta b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_material.mat.meta similarity index 79% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_material.mat.meta rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match_material.mat.meta index 2466cac2e..ff292bdbe 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_material.mat.meta +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cdc0d0003273d42ea91db493b70f6c9e +guid: ed245144e5b03174894bd81f6a291d99 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_skeletondata.asset b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_skeletondata.asset similarity index 79% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui_skeletondata.asset rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match_skeletondata.asset index 68501a02f..5a88f4ae6 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: arena_match_ui_skeletondata + m_Name: ui_arena_match_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: f601531d04e523b46bf20201fc0534f9, type: 2} + - {fileID: 11400000, guid: 953bb593ec85c674eb77251d01d7cf0e, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 03f29b083ae631f4f9e5fc4ceb91cdf0, type: 3} + skeletonJSON: {fileID: 4900000, guid: 9610bd88f4fd499478aad29fa3e24800, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_atlas.asset.meta b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_skeletondata.asset.meta similarity index 79% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_atlas.asset.meta rename to Assets/arts/spines/ui/ui_arena_match/ui_arena_match_skeletondata.asset.meta index ffc1795eb..22ea6716e 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_arena_match/ui_arena_match_skeletondata.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 231dfd11388d645128fffa1520358927 +guid: ad7ca7f318f2e5a42af8c4f28c988e44 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.atlas.txt b/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.atlas.txt index 30ec0fa86..1486eea81 100644 --- a/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.atlas.txt +++ b/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.atlas.txt @@ -2,17 +2,17 @@ ui_daily_challenge_buff.png size:1024,1024 filter:Linear,Linear 1 -bounds:600,467,129,290 -offsets:0,0,130,291 +bounds:1,175,244,357 +offsets:2,4,248,364 2 -bounds:1,175,305,174 +bounds:456,794,339,193 3 -bounds:600,759,305,174 -guang -bounds:1,351,597,582 -offsets:26,31,658,658 -hong -bounds:1,1,305,172 -lan -bounds:308,44,305,172 +bounds:247,193,339,193 rotate:90 +guang +bounds:1,534,453,453 +offsets:31,21,505,505 +hong +bounds:456,620,305,172 +lan +bounds:1,1,305,172 diff --git a/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.png b/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.png index d06cfb865..6b2d58235 100644 Binary files a/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.png and b/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.png differ diff --git a/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.skel.bytes b/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.skel.bytes index 49d00cc29..8466f83e3 100644 Binary files a/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.skel.bytes and b/Assets/arts/spines/ui/ui_daily_challenge_buff/ui_daily_challenge_buff.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt new file mode 100644 index 000000000..9f446cd83 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt @@ -0,0 +1,34 @@ +ui_main_btn_challenge.png +size:256,256 +filter:Linear,Linear +fang1 +bounds:98,196,6,6 +offsets:1,1,8,8 +fang2 +bounds:98,196,6,6 +offsets:1,1,8,8 +fang3 +bounds:98,196,6,6 +offsets:1,1,8,8 +fang4 +bounds:98,196,6,6 +offsets:1,1,8,8 +fang5 +bounds:98,196,6,6 +offsets:1,1,8,8 +fang7 +bounds:98,196,6,6 +offsets:1,1,8,8 +fang8 +bounds:98,196,6,6 +offsets:1,1,8,8 +fang6 +bounds:2,2,6,6 +offsets:1,1,8,8 +spine +bounds:2,107,94,95 +offsets:1,1,96,97 +tiao +bounds:98,188,5,6 +zhihui +bounds:2,10,94,95 diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt.meta similarity index 75% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.atlas.txt.meta rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt.meta index c8b72436c..9525a5a3b 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bdfc8a7503b9c4c1ca8fc6518399de5d +guid: 18f469229294556429dab4b696c88262 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png new file mode 100644 index 000000000..e80761df6 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.png.meta b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png.meta similarity index 98% rename from Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.png.meta rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png.meta index 374e04f0a..6686e8de1 100644 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.png.meta +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a4c64dcc52d544c2b8d010e7c0f6cb83 +guid: 2830f02eb602d7044be43a627b958946 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -90,17 +90,17 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 - buildTarget: iPhone + buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 + textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -114,17 +114,17 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Server + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 50 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes new file mode 100644 index 000000000..1466b3845 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes.meta similarity index 75% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.skel.bytes.meta rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes.meta index c33fca4ff..557cfabda 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 825250f6ebb5d41a3be151f9f36f0a4f +guid: ce2988b6f7d7ab2419bc9bc9e4619c99 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_atlas.asset b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_atlas.asset similarity index 71% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_atlas.asset rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_atlas.asset index cf03e050e..5bf6fa879 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_atlas.asset +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: ui_mainbtn_challenge_atlas + m_Name: ui_main_btn_challenge_atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: bdfc8a7503b9c4c1ca8fc6518399de5d, type: 3} + atlasFile: {fileID: 4900000, guid: 18f469229294556429dab4b696c88262, type: 3} materials: - - {fileID: 2100000, guid: cdc0d0003273d42ea91db493b70f6c9e, type: 2} + - {fileID: 2100000, guid: 9ce38fbe6a4d6274abf5f6dbda379e10, type: 2} diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_atlas.asset.meta similarity index 79% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui_atlas.asset.meta rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_atlas.asset.meta index 7b97df9bb..299acc4b9 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f601531d04e523b46bf20201fc0534f9 +guid: da99de1dbab9f7a48a597d39660d94e7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_material.mat b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_material.mat similarity index 84% rename from Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_material.mat rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_material.mat index fd4ce900a..1266cf21e 100644 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_material.mat @@ -7,9 +7,10 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ui_mainbtn_company_material + m_Name: ui_main_btn_challenge_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -22,7 +23,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: a4c64dcc52d544c2b8d010e7c0f6cb83, type: 3} + m_Texture: {fileID: 2800000, guid: 2830f02eb602d7044be43a627b958946, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] @@ -36,7 +37,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_material.mat.meta b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_material.mat.meta similarity index 79% rename from Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_material.mat.meta rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_material.mat.meta index 84b33f9fe..84cbaea5b 100644 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_material.mat.meta +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 196447820400a4e7db058835c53a6712 +guid: 9ce38fbe6a4d6274abf5f6dbda379e10 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_skeletondata.asset b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_skeletondata.asset similarity index 77% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_skeletondata.asset rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_skeletondata.asset index 32006786a..8ec68ee8a 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: ui_mainbtn_challenge_skeletondata + m_Name: ui_main_btn_challenge_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 231dfd11388d645128fffa1520358927, type: 2} + - {fileID: 11400000, guid: da99de1dbab9f7a48a597d39660d94e7, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 825250f6ebb5d41a3be151f9f36f0a4f, type: 3} + skeletonJSON: {fileID: 4900000, guid: ce2988b6f7d7ab2419bc9bc9e4619c99, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_skeletondata.asset.meta similarity index 79% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_skeletondata.asset.meta rename to Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_skeletondata.asset.meta index 89557361e..ae7a85b54 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge_skeletondata.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 777f208010d4f4bd49ec1cf6335978db +guid: 76dc93ac6411f38448913efd158ff63a NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.atlas.txt deleted file mode 100644 index bc79b9bf4..000000000 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.atlas.txt +++ /dev/null @@ -1,7 +0,0 @@ -ui_mainbtn_challenge.png -size:256,256 -filter:Linear,Linear -yuan -bounds:2,106,119,102 -zhihui -bounds:2,2,119,102 diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.png b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.png deleted file mode 100644 index d9efb2233..000000000 Binary files a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.png and /dev/null differ diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.skel.bytes deleted file mode 100644 index 46417c25a..000000000 Binary files a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge.skel.bytes and /dev/null differ diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt new file mode 100644 index 000000000..59e6f8c98 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt @@ -0,0 +1,23 @@ +ui_main_btn_company.png +size:256,256 +filter:Linear,Linear +jz_1 +bounds:103,189,56,49 +offsets:1,1,58,51 +jz_2 +bounds:103,155,24,32 +offsets:1,1,26,34 +jz_3 +bounds:2,2,16,10 +offsets:1,1,18,12 +jz_4 +bounds:161,203,9,35 +offsets:1,1,11,37 +jz_5 +bounds:2,48,92,89 +offsets:1,1,94,91 +jz_6 +bounds:2,14,59,32 +offsets:1,1,61,34 +zhihui +bounds:2,139,99,99 diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt.meta new file mode 100644 index 000000000..0885ac413 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 269206b062939284a9a0734a9eecae1e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png new file mode 100644 index 000000000..f15e81fc8 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png differ diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.png.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png.meta similarity index 98% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui.png.meta rename to Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png.meta index 3a35362d3..2b642fc9b 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui.png.meta +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 206eb88d891bc2c43b300ce5c1394f5a +guid: 2bb83d63981c7f543863bed998c6b152 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes new file mode 100644 index 000000000..675e7312f Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes.meta new file mode 100644 index 000000000..2fc1e1809 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8cdfa98732e62fd45be4aed091cd2f98 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_atlas.asset b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_atlas.asset similarity index 71% rename from Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_atlas.asset rename to Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_atlas.asset index 0720bb698..a7d13c393 100644 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_atlas.asset +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_atlas.asset @@ -10,10 +10,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: ui_mainbtn_company_atlas + m_Name: ui_main_btn_company_atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} - atlasFile: {fileID: 4900000, guid: 02cc0b307bb3d4973bf3364729bbbc9c, type: 3} + atlasFile: {fileID: 4900000, guid: 269206b062939284a9a0734a9eecae1e, type: 3} materials: - - {fileID: 2100000, guid: 196447820400a4e7db058835c53a6712, type: 2} + - {fileID: 2100000, guid: 0f68eabf845f2ff4283d2c5e4b35e646, type: 2} diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_atlas.asset.meta new file mode 100644 index 000000000..d02d0ed2e --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 273a07371a78f244d8bb081e932c9cc6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_material.mat b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_material.mat similarity index 84% rename from Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_material.mat rename to Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_material.mat index 4ea53c88d..cb65874fd 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_mainbtn_challenge_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_material.mat @@ -7,9 +7,10 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ui_mainbtn_challenge_material + m_Name: ui_main_btn_company_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -22,7 +23,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 2fb06227c5f734577a2bb75760580292, type: 3} + m_Texture: {fileID: 2800000, guid: 2bb83d63981c7f543863bed998c6b152, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] @@ -36,7 +37,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 diff --git a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_material.mat.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_material.mat.meta similarity index 79% rename from Assets/arts/spines/ui/ui_arena_match/arena_match_ui_material.mat.meta rename to Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_material.mat.meta index 006833ca1..21177a9b2 100644 --- a/Assets/arts/spines/ui/ui_arena_match/arena_match_ui_material.mat.meta +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d73755b6d7ee35a4cb5eac6d6febd8c7 +guid: 0f68eabf845f2ff4283d2c5e4b35e646 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_skeletondata.asset b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_skeletondata.asset similarity index 77% rename from Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_skeletondata.asset rename to Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_skeletondata.asset index e988d5238..dc4d3d478 100644 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: ui_mainbtn_company_skeletondata + m_Name: ui_main_btn_company_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 420f1993c6a124ae19850f83e8c1fecf, type: 2} + - {fileID: 11400000, guid: 273a07371a78f244d8bb081e932c9cc6, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 497f02d55b4534010aa1fed6800c5402, type: 3} + skeletonJSON: {fileID: 4900000, guid: 8cdfa98732e62fd45be4aed091cd2f98, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_skeletondata.asset.meta new file mode 100644 index 000000000..766f9752f --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4123c706459ceac4bb92565b3c22e98a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.atlas.txt deleted file mode 100644 index f3b8346e4..000000000 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.atlas.txt +++ /dev/null @@ -1,7 +0,0 @@ -ui_mainbtn_company.png -size:256,256 -filter:Linear,Linear -yuan -bounds:2,117,107,113 -zhihui -bounds:2,2,107,113 diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.atlas.txt.meta deleted file mode 100644 index 6dbf07f2c..000000000 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.atlas.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 02cc0b307bb3d4973bf3364729bbbc9c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.png b/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.png deleted file mode 100644 index 4b8bbb2c5..000000000 Binary files a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.png and /dev/null differ diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.skel.bytes deleted file mode 100644 index 2a1801217..000000000 Binary files a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.skel.bytes and /dev/null differ diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.skel.bytes.meta deleted file mode 100644 index b769ecada..000000000 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company.skel.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 497f02d55b4534010aa1fed6800c5402 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_atlas.asset.meta deleted file mode 100644 index 1fa711ba8..000000000 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_atlas.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 420f1993c6a124ae19850f83e8c1fecf -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_skeletondata.asset.meta deleted file mode 100644 index 9f4ce20a5..000000000 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_mainbtn_company_skeletondata.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 513197592452c475a9acae1714fa2bb7 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.atlas.txt index a05879d65..2c4829676 100644 --- a/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.atlas.txt @@ -2,8 +2,8 @@ ui_main_btn_fight.png size:256,256 filter:Linear,Linear jian_1 -bounds:2,13,109,110 +bounds:2,21,102,96 jian_2 -bounds:127,125,108,110 +bounds:113,119,102,96 zhihui -bounds:2,125,123,110 +bounds:2,119,109,96 diff --git a/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.png b/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.png index 935f92362..ae825448b 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.png and b/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.skel.bytes index 190aa0e71..7a51aacb4 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.skel.bytes and b/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight_skeletondata.asset b/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight_skeletondata.asset index c23b8bc2b..9adbbfa20 100644 --- a/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_btn_fight/ui_main_btn_fight_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_main_btn_force/ui_main_btn_force.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.atlas.txt index 3766e1213..54cce71a3 100644 --- a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.atlas.txt @@ -1,7 +1,20 @@ ui_main_btn_force.png size:256,256 filter:Linear,Linear -toukui -bounds:2,115,95,111 +boli +bounds:184,207,57,45 +offsets:1,1,59,47 +ding +bounds:97,183,85,69 +offsets:1,1,87,71 +gg +bounds:2,2,74,75 +offsets:1,1,76,77 +spine +bounds:2,79,92,74 +offsets:1,1,94,76 zhihui -bounds:2,2,95,111 +bounds:2,155,93,97 +ziti1 +bounds:97,168,41,13 +offsets:1,1,43,15 diff --git a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.png b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.png index f4d73f4a5..235280525 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.png and b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.png.meta b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.png.meta index d494d20e3..f8cb422bf 100644 --- a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.png.meta +++ b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.png.meta @@ -90,17 +90,17 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 - buildTarget: iPhone + buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 + textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -114,17 +114,17 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Server + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 50 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.skel.bytes index f16ea6231..f8b18749f 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.skel.bytes and b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_material.mat b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_material.mat index 71e5d7fa4..435858d20 100644 --- a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_force_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -36,7 +37,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 diff --git a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_skeletondata.asset b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_skeletondata.asset index 3db945e2a..bc7a38dfd 100644 --- a/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_btn_force/ui_main_btn_force_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_main_btn_shop/ui_main_btn_shop.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt index f98a972cc..b23f55ccb 100644 --- a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt @@ -1,9 +1,20 @@ ui_main_btn_shop.png size:256,256 filter:Linear,Linear -shangsheng_1 -bounds:98,158,94,46 -shangsheng_2 -bounds:2,2,88,100 +cp_1 +bounds:92,93,40,12 +offsets:1,1,42,14 +rotate:90 +cp_2 +bounds:110,147,41,21 +rotate:90 +cp_3 +bounds:2,2,43,27 +cp_4 +bounds:110,190,40,47 +shouqiang +bounds:2,31,88,102 +offsets:1,1,90,104 zhihui -bounds:2,104,94,100 +bounds:2,135,106,102 +offsets:1,1,108,104 diff --git a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png index f9376b450..0fa54a58b 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png and b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes index ddeea7356..7dfc4a535 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes and b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_skeletondata.asset b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_skeletondata.asset index 87888be58..bd4f75dec 100644 --- a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0}