diff --git a/Assets/ManagedResources/Atlas/ArenaTopMatchAtlas/r_jingjichang_mingzidi_01.png.meta b/Assets/ManagedResources/Atlas/ArenaTopMatchAtlas/r_jingjichang_mingzidi_01.png.meta index ac77d6dab6..61668ced57 100644 --- a/Assets/ManagedResources/Atlas/ArenaTopMatchAtlas/r_jingjichang_mingzidi_01.png.meta +++ b/Assets/ManagedResources/Atlas/ArenaTopMatchAtlas/r_jingjichang_mingzidi_01.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 22, y: 26, z: 23, w: 17} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_zifumingzidi.png.meta b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_zifumingzidi.png.meta index f77bbf6cf5..90ddd80f8c 100644 --- a/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_zifumingzidi.png.meta +++ b/Assets/ManagedResources/Atlas/PracticeAtlas/x_xiuxing_zifu_zifumingzidi.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 10, y: 13, z: 11, w: 11} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/BG/t_tequan_henlandi.png.meta b/Assets/ManagedResources/BG/t_tequan_henlandi.png.meta index f29ad832cd..7e9fa6d1f4 100644 --- a/Assets/ManagedResources/BG/t_tequan_henlandi.png.meta +++ b/Assets/ManagedResources/BG/t_tequan_henlandi.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 39, y: 26, z: 35, w: 29} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -115,7 +115,7 @@ TextureImporter: width: 1080 height: 687 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/ManagedResources/DynamicAtlas/r_zjm_didi.png.meta b/Assets/ManagedResources/DynamicAtlas/r_zjm_didi.png.meta index 362a03b968..8cbc838ea8 100644 --- a/Assets/ManagedResources/DynamicAtlas/r_zjm_didi.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/r_zjm_didi.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 1073, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index d1f67fe50f..ad13d5a99a 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2240,7 +2240,7 @@ Language = { [12239] = GetLanguageStrById("精炼大师%s级"), [12240] = GetLanguageStrById("神魂%s:%s"), [12241] = GetLanguageStrById("神魂效果"), - [12242] = GetLanguageStrById("修炼"), + [12242] = GetLanguageStrById("神觉"), [12243] = GetLanguageStrById("飞升5解锁"), [12244] = GetLanguageStrById("飞升3解锁"), [12245] = GetLanguageStrById("星解锁\n"),