diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 4c892be0a..03d15544b 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -98,6 +98,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 39479e4453f65544fac7cfe3ac9647cf, type: 3} - {fileID: 21300000, guid: 9abaaf4457b41ea46ba4f998c247ddb6, type: 3} - {fileID: 21300000, guid: 910d70541d2615b439c52b2f084d86af, type: 3} + - {fileID: 21300000, guid: 7d793a541d37b584ca94c3b139decd2c, type: 3} - {fileID: 21300000, guid: a74c16745d61ac24da8d1f1f8b000884, type: 3} - {fileID: 21300000, guid: 3e59dd84e2531004687f4aac9e94a88e, type: 3} - {fileID: 21300000, guid: c0d66e84bb441904390a26e5f00c0b59, type: 3} @@ -251,6 +252,7 @@ SpriteAtlas: - common_dec_14 - common_menu_3 - common_board_107 + - common_title_17 - common_progress_5 - common_board_110 - common_btn_red_1 diff --git a/Assets/arts/textures/ui/common/common_title_17.png b/Assets/arts/textures/ui/common/common_title_17.png new file mode 100644 index 000000000..9de99dc9a Binary files /dev/null and b/Assets/arts/textures/ui/common/common_title_17.png differ diff --git a/Assets/arts/textures/ui/common/common_title_17.png.meta b/Assets/arts/textures/ui/common/common_title_17.png.meta new file mode 100644 index 000000000..6273ace23 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_title_17.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 7d793a541d37b584ca94c3b139decd2c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 46, y: 0, z: 73, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/config/strings/cn/chapter_dungeon_equip.lua.bytes b/Assets/lua/app/config/strings/cn/chapter_dungeon_equip.lua.bytes index 49150cb23..f4f077627 100644 Binary files a/Assets/lua/app/config/strings/cn/chapter_dungeon_equip.lua.bytes and b/Assets/lua/app/config/strings/cn/chapter_dungeon_equip.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 5486f5447..bb61ede1d 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index d6cb38256..f3e30e21e 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/module/common/common_manager.lua.bytes b/Assets/lua/app/module/common/common_manager.lua.bytes index 5f138d151..fd92792f7 100644 Binary files a/Assets/lua/app/module/common/common_manager.lua.bytes and b/Assets/lua/app/module/common/common_manager.lua.bytes differ diff --git a/Assets/lua/app/module/dungeon/dungeon_const.lua.bytes b/Assets/lua/app/module/dungeon/dungeon_const.lua.bytes new file mode 100644 index 000000000..49313125b --- /dev/null +++ b/Assets/lua/app/module/dungeon/dungeon_const.lua.bytes @@ -0,0 +1,4 @@ +bf_encrypt_luai)1X+H-ø8GH:uua0 +3D9xI4k5MR0qYxsCX9Z)'\^ M!VfP[*7_. +W0+5Ít0qpO8òeA9xI0nauuv>}35 wkH4k5MR0quoy ( kkK4k5MR0qpi8rdD9xI4l5MR1qqi