diff --git a/Assets/arts/atlas/icon/hero.asset b/Assets/arts/atlas/icon/hero.asset index 22320eac1..8c18c66e3 100644 --- a/Assets/arts/atlas/icon/hero.asset +++ b/Assets/arts/atlas/icon/hero.asset @@ -29,6 +29,9 @@ MonoBehaviour: - {fileID: 21300000, guid: 4f00316482eef8e4d8854d8d03b64ea4, type: 3} - {fileID: 21300000, guid: c042c1c7c85392e449166b4197c07526, type: 3} - {fileID: 21300000, guid: d8738d1f5aae3014bb0710c44865f333, type: 3} + - {fileID: 21300000, guid: dab912016d15a474bba88f941dbe15ee, type: 3} + - {fileID: 21300000, guid: ebf7e343b1d2b79428117236afdf64cc, type: 3} + - {fileID: 21300000, guid: d012b6cc00c51734195445a3c6d15cf7, type: 3} - {fileID: 21300000, guid: 5ae3b4c8d1b2dc944968d2a268712728, type: 3} - {fileID: 21300000, guid: 638ce4d0c24ad074789d94172ec0aab7, type: 3} - {fileID: 21300000, guid: 31d65db45a06f7b4f8e38cd94da730f9, type: 3} @@ -60,4 +63,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb4e7dbdf89792644a8941a7e107e9ce, type: 3} - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3} - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3} - spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f06000040060000410600003300000034000000350000003600000037000000380000003900000008e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 + spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f06000040060000410600004206000043060000440600003300000034000000350000003600000037000000380000003900000008e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 diff --git a/Assets/arts/atlas/icon/hero.spriteatlas b/Assets/arts/atlas/icon/hero.spriteatlas index 61d26c41e..7b0f2fcf1 100644 --- a/Assets/arts/atlas/icon/hero.spriteatlas +++ b/Assets/arts/atlas/icon/hero.spriteatlas @@ -64,10 +64,12 @@ SpriteAtlas: - {fileID: 21300000, guid: 5c6bf200d40af1645928a69f5be74689, type: 3} - {fileID: 21300000, guid: 176147803f6170a4ea4b1386b7fff51b, type: 3} - {fileID: 21300000, guid: 638ce4d0c24ad074789d94172ec0aab7, type: 3} + - {fileID: 21300000, guid: dab912016d15a474bba88f941dbe15ee, type: 3} - {fileID: 21300000, guid: c1d35f3153f12a14c9c8957a905b0b28, type: 3} - {fileID: 21300000, guid: 08b6d902b86c0b34e92ab673197fb767, type: 3} - {fileID: 21300000, guid: 056b0c62d8026c546bd043ae92411b15, type: 3} - {fileID: 21300000, guid: 643846a215ab336468ec5ce2377a6325, type: 3} + - {fileID: 21300000, guid: ebf7e343b1d2b79428117236afdf64cc, type: 3} - {fileID: 21300000, guid: 063945c3b6adee543ada4d5f7cdd0a26, type: 3} - {fileID: 21300000, guid: de757454ab9e6564c8a1244f5ea154d3, type: 3} - {fileID: 21300000, guid: 4f00316482eef8e4d8854d8d03b64ea4, type: 3} @@ -99,6 +101,7 @@ SpriteAtlas: - {fileID: 21300000, guid: c0749e7b392e1e044b5a7c8cbe3d1d2e, type: 3} - {fileID: 21300000, guid: 6a30f59b929a4b94fa05fd1d15e0c027, type: 3} - {fileID: 21300000, guid: d787ecac73aac5b4a90deb7d7e500d22, type: 3} + - {fileID: 21300000, guid: d012b6cc00c51734195445a3c6d15cf7, type: 3} - {fileID: 21300000, guid: 859ffdecd8e7dbc4298a00723aafc515, type: 3} - {fileID: 21300000, guid: 5d9ffdfc3fbf76d4c831f69d2afe48e3, type: 3} - {fileID: 21300000, guid: 72b9b64de3f480041b53bc58450bcc29, type: 3} @@ -112,10 +115,12 @@ SpriteAtlas: - 20 - 1 - 4 + - 24 - hero_s - frame_dec_3 - 8 - 14 + - 25 - hero_fragment - frame_dec_4 - 21 @@ -147,6 +152,7 @@ SpriteAtlas: - frame_gray_3 - 10 - 16 + - 26 - frame_small_1 - 9 - check diff --git a/Assets/arts/atlas/icon/hero_2.asset b/Assets/arts/atlas/icon/hero_2.asset index 9e6af9b5d..5542675e9 100644 --- a/Assets/arts/atlas/icon/hero_2.asset +++ b/Assets/arts/atlas/icon/hero_2.asset @@ -29,6 +29,9 @@ MonoBehaviour: - {fileID: 21300000, guid: c9f3c32207520e541a405ef85de653c9, type: 3} - {fileID: 21300000, guid: 1017ce1418f44884081066c1094a629d, type: 3} - {fileID: 21300000, guid: bb7ae063543bf0b4d90dd6d8d2c782de, type: 3} + - {fileID: 21300000, guid: 3640eb55b93fad042a9ea520f1364a7b, type: 3} + - {fileID: 21300000, guid: 48de69353846dea4a81cda84ed28bc51, type: 3} + - {fileID: 21300000, guid: 7130e790e9393b74aa40cd0f1de9b2d3, type: 3} - {fileID: 21300000, guid: 83831e4876c42b246b8aa584a6a4ea02, type: 3} - {fileID: 21300000, guid: a497ac305caf93842baa092025bdd71e, type: 3} - {fileID: 21300000, guid: 90c97800de3e8d5428aa7906c15b7ba8, type: 3} @@ -36,4 +39,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 45ce406af6ae6e248a58693b5d4fedb1, type: 3} - {fileID: 21300000, guid: 64a08f786204a98499066d1c13de7273, type: 3} - {fileID: 21300000, guid: e418dc2ac39d0c84cab1807decaaba9b, type: 3} - spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f060000400600004106000033000000340000003500000036000000370000003800000039000000 + spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f060000400600004106000042060000430600004406000033000000340000003500000036000000370000003800000039000000 diff --git a/Assets/arts/atlas/icon/hero_2.spriteatlas b/Assets/arts/atlas/icon/hero_2.spriteatlas index 0ba973add..3687fc7b7 100644 --- a/Assets/arts/atlas/icon/hero_2.spriteatlas +++ b/Assets/arts/atlas/icon/hero_2.spriteatlas @@ -63,6 +63,7 @@ SpriteAtlas: m_PackedSprites: - {fileID: 21300000, guid: 90c97800de3e8d5428aa7906c15b7ba8, type: 3} - {fileID: 21300000, guid: a497ac305caf93842baa092025bdd71e, type: 3} + - {fileID: 21300000, guid: 7130e790e9393b74aa40cd0f1de9b2d3, type: 3} - {fileID: 21300000, guid: f334f6219a645ed4b9eae4189fe8a9f3, type: 3} - {fileID: 21300000, guid: c9f3c32207520e541a405ef85de653c9, type: 3} - {fileID: 21300000, guid: bb7ae063543bf0b4d90dd6d8d2c782de, type: 3} @@ -71,6 +72,8 @@ SpriteAtlas: - {fileID: 21300000, guid: 8905f5e482ea373429968d1d855c0cd7, type: 3} - {fileID: 21300000, guid: 569a7ae4f0309ce46a688882510a606f, type: 3} - {fileID: 21300000, guid: 65c8c6f4f823a3843abdc978b0882f78, type: 3} + - {fileID: 21300000, guid: 48de69353846dea4a81cda84ed28bc51, type: 3} + - {fileID: 21300000, guid: 3640eb55b93fad042a9ea520f1364a7b, type: 3} - {fileID: 21300000, guid: b970f2264d5d3474e81fae12f614b364, type: 3} - {fileID: 21300000, guid: ce90e6b69f2fdcf408e7e2a8c29530b5, type: 3} - {fileID: 21300000, guid: 83831e4876c42b246b8aa584a6a4ea02, type: 3} @@ -87,6 +90,7 @@ SpriteAtlas: m_PackedSpriteNamesToIndex: - 5 - 4 + - 26 - 13 - 21 - 23 @@ -95,6 +99,8 @@ SpriteAtlas: - 12 - 20 - 14 + - 25 + - 24 - 11 - 6 - 3 diff --git a/Assets/arts/atlas/ui/login.asset b/Assets/arts/atlas/ui/login.asset index 0afc5e47a..023d67492 100644 --- a/Assets/arts/atlas/ui/login.asset +++ b/Assets/arts/atlas/ui/login.asset @@ -15,5 +15,7 @@ MonoBehaviour: spriteList: - {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} - {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} + - {fileID: 21300000, guid: 74e0d5b6ed58d29468c407c05d927e26, type: 3} + - {fileID: 21300000, guid: 3b00a9a54080f474ead4a85af751c9f6, type: 3} - {fileID: 21300000, guid: 4c8cc7cd53e3b2846a4626abf9c5a69d, type: 3} - spriteNameList: 01dd90783fdd9078c4df9078 + spriteNameList: 01dd90783fdd9078cddd9078fadd9078c4df9078 diff --git a/Assets/arts/atlas/ui/login.spriteatlas b/Assets/arts/atlas/ui/login.spriteatlas index 73836542f..9fc1f1a36 100644 --- a/Assets/arts/atlas/ui/login.spriteatlas +++ b/Assets/arts/atlas/ui/login.spriteatlas @@ -61,10 +61,14 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: + - {fileID: 21300000, guid: 3b00a9a54080f474ead4a85af751c9f6, type: 3} + - {fileID: 21300000, guid: 74e0d5b6ed58d29468c407c05d927e26, type: 3} - {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} - {fileID: 21300000, guid: 4c8cc7cd53e3b2846a4626abf9c5a69d, type: 3} - {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} m_PackedSpriteNamesToIndex: + - login_ko + - login_ja - login_cn - login_zh - login_en diff --git a/Assets/arts/textures/background/hero/hero_bg_1.png b/Assets/arts/textures/background/hero/hero_bg_1.png index 8916db68c..5d7ebad0d 100644 Binary files a/Assets/arts/textures/background/hero/hero_bg_1.png and b/Assets/arts/textures/background/hero/hero_bg_1.png differ diff --git a/Assets/arts/textures/background/hero/hero_bg_1.png.meta b/Assets/arts/textures/background/hero/hero_bg_1.png.meta index 47f2d7d7a..d3cce80a8 100644 --- a/Assets/arts/textures/background/hero/hero_bg_1.png.meta +++ b/Assets/arts/textures/background/hero/hero_bg_1.png.meta @@ -79,7 +79,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 47 + textureFormat: 45 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/arts/textures/background/sevenday/sevenday_bg_3.png b/Assets/arts/textures/background/sevenday/sevenday_bg_3.png index 3772138c5..dbffa80a3 100644 Binary files a/Assets/arts/textures/background/sevenday/sevenday_bg_3.png and b/Assets/arts/textures/background/sevenday/sevenday_bg_3.png differ diff --git a/Assets/arts/textures/background/sevenday/sevenday_bg_3.png.meta b/Assets/arts/textures/background/sevenday/sevenday_bg_3.png.meta index 6a2b42f08..6054e6184 100644 --- a/Assets/arts/textures/background/sevenday/sevenday_bg_3.png.meta +++ b/Assets/arts/textures/background/sevenday/sevenday_bg_3.png.meta @@ -79,7 +79,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/arts/textures/icon/buff/curse.png b/Assets/arts/textures/icon/buff/curse.png index 3b474f6ee..7be9694af 100644 Binary files a/Assets/arts/textures/icon/buff/curse.png and b/Assets/arts/textures/icon/buff/curse.png differ diff --git a/Assets/arts/textures/icon/hero/24.png b/Assets/arts/textures/icon/hero/24.png new file mode 100644 index 000000000..97ac61a5a Binary files /dev/null and b/Assets/arts/textures/icon/hero/24.png differ diff --git a/Assets/arts/textures/icon/hero/24.png.meta b/Assets/arts/textures/icon/hero/24.png.meta new file mode 100644 index 000000000..dfcc7e6fc --- /dev/null +++ b/Assets/arts/textures/icon/hero/24.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: dab912016d15a474bba88f941dbe15ee +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: 0, y: 0, z: 0, 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/arts/textures/icon/hero/25.png b/Assets/arts/textures/icon/hero/25.png new file mode 100644 index 000000000..80dc58795 Binary files /dev/null and b/Assets/arts/textures/icon/hero/25.png differ diff --git a/Assets/arts/textures/icon/hero/25.png.meta b/Assets/arts/textures/icon/hero/25.png.meta new file mode 100644 index 000000000..6a5c3c9d0 --- /dev/null +++ b/Assets/arts/textures/icon/hero/25.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: ebf7e343b1d2b79428117236afdf64cc +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: 0, y: 0, z: 0, 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/arts/textures/icon/hero/26.png b/Assets/arts/textures/icon/hero/26.png new file mode 100644 index 000000000..aca074abd Binary files /dev/null and b/Assets/arts/textures/icon/hero/26.png differ diff --git a/Assets/arts/textures/icon/hero/26.png.meta b/Assets/arts/textures/icon/hero/26.png.meta new file mode 100644 index 000000000..8a5b5f2d8 --- /dev/null +++ b/Assets/arts/textures/icon/hero/26.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: d012b6cc00c51734195445a3c6d15cf7 +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: 0, y: 0, z: 0, 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/arts/textures/icon/hero_2/24.png b/Assets/arts/textures/icon/hero_2/24.png new file mode 100644 index 000000000..59f5f3ae5 Binary files /dev/null and b/Assets/arts/textures/icon/hero_2/24.png differ diff --git a/Assets/arts/textures/icon/hero_2/24.png.meta b/Assets/arts/textures/icon/hero_2/24.png.meta new file mode 100644 index 000000000..bfc8003f6 --- /dev/null +++ b/Assets/arts/textures/icon/hero_2/24.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 3640eb55b93fad042a9ea520f1364a7b +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: 0, y: 0, z: 0, 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/arts/textures/icon/hero_2/25.png b/Assets/arts/textures/icon/hero_2/25.png new file mode 100644 index 000000000..bccbf86ee Binary files /dev/null and b/Assets/arts/textures/icon/hero_2/25.png differ diff --git a/Assets/arts/textures/icon/hero_2/25.png.meta b/Assets/arts/textures/icon/hero_2/25.png.meta new file mode 100644 index 000000000..083c3586d --- /dev/null +++ b/Assets/arts/textures/icon/hero_2/25.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 48de69353846dea4a81cda84ed28bc51 +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: 0, y: 0, z: 0, 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/arts/textures/icon/hero_2/26.png b/Assets/arts/textures/icon/hero_2/26.png new file mode 100644 index 000000000..ee1b2d18e Binary files /dev/null and b/Assets/arts/textures/icon/hero_2/26.png differ diff --git a/Assets/arts/textures/icon/hero_2/26.png.meta b/Assets/arts/textures/icon/hero_2/26.png.meta new file mode 100644 index 000000000..918ee3e1a --- /dev/null +++ b/Assets/arts/textures/icon/hero_2/26.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 7130e790e9393b74aa40cd0f1de9b2d3 +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: 0, y: 0, z: 0, 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/arts/textures/ui/login/login_cn.png b/Assets/arts/textures/ui/login/login_cn.png index 6697a8728..21dc079c9 100644 Binary files a/Assets/arts/textures/ui/login/login_cn.png and b/Assets/arts/textures/ui/login/login_cn.png differ diff --git a/Assets/arts/textures/ui/login/login_en.png b/Assets/arts/textures/ui/login/login_en.png index 227614423..729d0f075 100644 Binary files a/Assets/arts/textures/ui/login/login_en.png and b/Assets/arts/textures/ui/login/login_en.png differ diff --git a/Assets/arts/textures/ui/login/login_ja.png b/Assets/arts/textures/ui/login/login_ja.png new file mode 100644 index 000000000..545894181 Binary files /dev/null and b/Assets/arts/textures/ui/login/login_ja.png differ diff --git a/Assets/arts/textures/ui/login/login_ja.png.meta b/Assets/arts/textures/ui/login/login_ja.png.meta new file mode 100644 index 000000000..ea15c222e --- /dev/null +++ b/Assets/arts/textures/ui/login/login_ja.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 74e0d5b6ed58d29468c407c05d927e26 +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: 0, y: 0, z: 0, 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/arts/textures/ui/login/login_ko.png b/Assets/arts/textures/ui/login/login_ko.png new file mode 100644 index 000000000..ee36af959 Binary files /dev/null and b/Assets/arts/textures/ui/login/login_ko.png differ diff --git a/Assets/arts/textures/ui/login/login_ko.png.meta b/Assets/arts/textures/ui/login/login_ko.png.meta new file mode 100644 index 000000000..70b20e009 --- /dev/null +++ b/Assets/arts/textures/ui/login/login_ko.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 3b00a9a54080f474ead4a85af751c9f6 +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: 0, y: 0, z: 0, 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/arts/textures/ui/login/login_zh.png b/Assets/arts/textures/ui/login/login_zh.png index 89d629f21..dd4956420 100644 Binary files a/Assets/arts/textures/ui/login/login_zh.png and b/Assets/arts/textures/ui/login/login_zh.png differ diff --git a/Assets/first/ui/first.prefab b/Assets/first/ui/first.prefab index 629bed5e2..7fd66ace3 100644 --- a/Assets/first/ui/first.prefab +++ b/Assets/first/ui/first.prefab @@ -205,7 +205,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.8601685} m_AnchorMax: {x: 0.5, y: 0.8601685} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 462, y: 274} + m_SizeDelta: {x: 500, y: 274} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2393798849200291726 CanvasRenderer: @@ -367,7 +367,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.8601685} m_AnchorMax: {x: 0.5, y: 0.8601685} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 462, y: 274} + m_SizeDelta: {x: 500, y: 274} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4234644678276498588 CanvasRenderer: @@ -499,6 +499,78 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 1} m_EffectDistance: {x: 1.5, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &4658006209363728080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5982696098298050255} + - component: {fileID: 4473289711951976078} + - component: {fileID: 530872073208482492} + m_Layer: 0 + m_Name: logo_jp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5982696098298050255 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4658006209363728080} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 9213377628658369777} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.8601685} + m_AnchorMax: {x: 0.5, y: 0.8601685} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 274} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4473289711951976078 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4658006209363728080} + m_CullTransparentMesh: 1 +--- !u!114 &530872073208482492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4658006209363728080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 01f9180d9215694469cd96f81d300894, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4799535475639508942 GameObject: m_ObjectHideFlags: 0 @@ -773,7 +845,7 @@ RectTransform: m_Children: - {fileID: 9148346167279928157} m_Father: {fileID: 9213377628658369777} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -897,6 +969,78 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: +--- !u!1 &7327329610748100606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6317411532925234940} + - component: {fileID: 8500606113167933942} + - component: {fileID: 5648336400005425721} + m_Layer: 0 + m_Name: logo_kr + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6317411532925234940 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7327329610748100606} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 9213377628658369777} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.8601685} + m_AnchorMax: {x: 0.5, y: 0.8601685} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 274} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8500606113167933942 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7327329610748100606} + m_CullTransparentMesh: 1 +--- !u!114 &5648336400005425721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7327329610748100606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: de85a343c0da0614287f41246b1c43bb, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &7951321131389539729 GameObject: m_ObjectHideFlags: 0 @@ -1161,7 +1305,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.8601685} m_AnchorMax: {x: 0.5, y: 0.8601685} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 462, y: 274} + m_SizeDelta: {x: 500, y: 274} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1150403572733026150 CanvasRenderer: @@ -1233,6 +1377,8 @@ RectTransform: - {fileID: 9066556996141082526} - {fileID: 1914851074799912470} - {fileID: 2081273143008909398} + - {fileID: 5982696098298050255} + - {fileID: 6317411532925234940} - {fileID: 6713900878529609591} m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/first/ui/login_cn.png b/Assets/first/ui/login_cn.png index 6697a8728..21dc079c9 100644 Binary files a/Assets/first/ui/login_cn.png and b/Assets/first/ui/login_cn.png differ diff --git a/Assets/first/ui/login_en.png b/Assets/first/ui/login_en.png index 227614423..729d0f075 100644 Binary files a/Assets/first/ui/login_en.png and b/Assets/first/ui/login_en.png differ diff --git a/Assets/first/ui/login_ja.png b/Assets/first/ui/login_ja.png new file mode 100644 index 000000000..545894181 Binary files /dev/null and b/Assets/first/ui/login_ja.png differ diff --git a/Assets/first/ui/login_ja.png.meta b/Assets/first/ui/login_ja.png.meta new file mode 100644 index 000000000..063f7ed24 --- /dev/null +++ b/Assets/first/ui/login_ja.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: f79d94ec96dc8ab4e8e023bbb5e12508 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/first/ui/login_ko.png b/Assets/first/ui/login_ko.png new file mode 100644 index 000000000..ee36af959 Binary files /dev/null and b/Assets/first/ui/login_ko.png differ diff --git a/Assets/first/ui/login_ko.png.meta b/Assets/first/ui/login_ko.png.meta new file mode 100644 index 000000000..19012f30a --- /dev/null +++ b/Assets/first/ui/login_ko.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 0feb5ef53b106aa40be98002c2353e29 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/first/ui/login_zh.png b/Assets/first/ui/login_zh.png index 89d629f21..dd4956420 100644 Binary files a/Assets/first/ui/login_zh.png and b/Assets/first/ui/login_zh.png differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index 212fd6c69..190d16d3c 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 28.5, y: 0} - m_SizeDelta: {x: -61, y: -26} + m_SizeDelta: {x: -63, y: -28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3661037841252071976 CanvasRenderer: @@ -385,7 +385,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 28.5, y: 0} - m_SizeDelta: {x: -61, y: -26} + m_SizeDelta: {x: -63, y: -28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7271434150130194861 CanvasRenderer: @@ -722,7 +722,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 28.5, y: 0} - m_SizeDelta: {x: -61, y: -26} + m_SizeDelta: {x: -63, y: -28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9135188438221434283 CanvasRenderer: @@ -5100,7 +5100,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 28.5, y: 0} - m_SizeDelta: {x: -61, y: -26} + m_SizeDelta: {x: -63, y: -28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8910900461885378648 CanvasRenderer: @@ -5607,7 +5607,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 28.5, y: 0} - m_SizeDelta: {x: -61, y: -26} + m_SizeDelta: {x: -63, y: -28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5629985595605083829 CanvasRenderer: diff --git a/Assets/prefabs/ui/bounty/bounty_main_ui.prefab b/Assets/prefabs/ui/bounty/bounty_main_ui.prefab index f8dd464d2..93a6c5ea4 100644 --- a/Assets/prefabs/ui/bounty/bounty_main_ui.prefab +++ b/Assets/prefabs/ui/bounty/bounty_main_ui.prefab @@ -291,15 +291,15 @@ RectTransform: m_GameObject: {fileID: 371330441736455544} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3449721205426155282} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 61, y: 47} - m_SizeDelta: {x: 74, y: 78} + m_AnchoredPosition: {x: 69, y: 53} + m_SizeDelta: {x: 102, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6392624051114520991 CanvasRenderer: @@ -329,7 +329,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7372681aea33b7b4099e3685b7ee975e, type: 3} + m_Sprite: {fileID: 21300000, guid: 1e55a4a32dd1ec240af52ddccebc7c46, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/common/hero_cell.prefab b/Assets/prefabs/ui/common/hero_cell.prefab index 0d7ca455d..2a631294a 100644 --- a/Assets/prefabs/ui/common/hero_cell.prefab +++ b/Assets/prefabs/ui/common/hero_cell.prefab @@ -586,7 +586,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 31} - m_SizeDelta: {x: 116, y: 116} + m_SizeDelta: {x: 114, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3537342382456181005 CanvasRenderer: diff --git a/Assets/prefabs/ui/common/large_hero_cell.prefab b/Assets/prefabs/ui/common/large_hero_cell.prefab index 01b4df5d5..0f303b530 100644 --- a/Assets/prefabs/ui/common/large_hero_cell.prefab +++ b/Assets/prefabs/ui/common/large_hero_cell.prefab @@ -705,10 +705,10 @@ RectTransform: m_Father: {fileID: 3357254900952041124} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -65} - m_SizeDelta: {x: 116, y: 116} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 75} + m_SizeDelta: {x: 114, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3537342382456181005 CanvasRenderer: diff --git a/Assets/prefabs/ui/login/login_ui.prefab b/Assets/prefabs/ui/login/login_ui.prefab index e6f740485..4ba7e5d53 100644 --- a/Assets/prefabs/ui/login/login_ui.prefab +++ b/Assets/prefabs/ui/login/login_ui.prefab @@ -411,7 +411,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.8601685} m_AnchorMax: {x: 0.5, y: 0.8601685} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 462, y: 274} + m_SizeDelta: {x: 500, y: 274} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6606998168073101089 CanvasRenderer: diff --git a/Assets/prefabs/ui/login/test_login_ui.prefab b/Assets/prefabs/ui/login/test_login_ui.prefab index 722935ba5..3367b88b8 100644 --- a/Assets/prefabs/ui/login/test_login_ui.prefab +++ b/Assets/prefabs/ui/login/test_login_ui.prefab @@ -986,7 +986,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.8601685} m_AnchorMax: {x: 0.5, y: 0.8601685} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 462, y: 274} + m_SizeDelta: {x: 500, y: 274} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4806986020387975939 CanvasRenderer: @@ -1016,7 +1016,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Sprite: {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 5d6b3c200..dbf28ebb7 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -1652,6 +1652,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4962385445208647175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7427886148868494453} + - component: {fileID: 3194657544111682895} + - component: {fileID: 8191960039231862908} + m_Layer: 0 + m_Name: line_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7427886148868494453 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4962385445208647175} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1848150626198586907} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 127, y: 0} + m_SizeDelta: {x: 8, y: 112} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &3194657544111682895 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4962385445208647175} + m_CullTransparentMesh: 1 +--- !u!114 &8191960039231862908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4962385445208647175} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5242937413599197595 GameObject: m_ObjectHideFlags: 0 @@ -2416,6 +2491,8 @@ RectTransform: - {fileID: 8544134998154596831} - {fileID: 283388478364906741} - {fileID: 7704011638835030197} + - {fileID: 4661127000006697023} + - {fileID: 7427886148868494453} - {fileID: 9063231875777621435} - {fileID: 8760634027036144284} - {fileID: 1172621875782705344} @@ -3528,12 +3605,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1848150626198586907} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 64} - m_SizeDelta: {x: 254, y: 128} + m_AnchoredPosition: {x: 0, y: 60} + m_SizeDelta: {x: 254, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2829657353007137055 CanvasRenderer: @@ -3573,6 +3650,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7488508107354361245 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4661127000006697023} + - component: {fileID: 1386399875459108104} + - component: {fileID: 6936252840893456730} + m_Layer: 0 + m_Name: line_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4661127000006697023 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7488508107354361245} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1848150626198586907} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -127, y: 0} + m_SizeDelta: {x: 8, y: 112} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &1386399875459108104 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7488508107354361245} + m_CullTransparentMesh: 1 +--- !u!114 &6936252840893456730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7488508107354361245} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7498027211161193123 GameObject: m_ObjectHideFlags: 0 @@ -4082,7 +4234,7 @@ RectTransform: - {fileID: 7900683791719762125} - {fileID: 4345138650635023754} m_Father: {fileID: 1848150626198586907} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -4719,7 +4871,7 @@ RectTransform: - {fileID: 2433600075686959437} - {fileID: 3046881078233975478} m_Father: {fileID: 1848150626198586907} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -4827,16 +4979,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &4345138650635023754 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 1493531801552903700} - m_PrefabAsset: {fileID: 0} --- !u!1 &1089572221801411436 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 1493531801552903700} m_PrefabAsset: {fileID: 0} +--- !u!224 &4345138650635023754 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 1493531801552903700} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1518043736896497656 PrefabInstance: m_ObjectHideFlags: 0 @@ -5253,16 +5405,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} ---- !u!224 &8897476989028766107 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4165930251451731960, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} - m_PrefabInstance: {fileID: 4803769959397203555} - m_PrefabAsset: {fileID: 0} --- !u!1 &4175967731956866547 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8889665677046596496, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} m_PrefabInstance: {fileID: 4803769959397203555} m_PrefabAsset: {fileID: 0} +--- !u!224 &8897476989028766107 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4165930251451731960, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + m_PrefabInstance: {fileID: 4803769959397203555} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4995549557732434771 PrefabInstance: m_ObjectHideFlags: 0 @@ -6527,16 +6679,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} ---- !u!1 &4044924788262064527 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} - m_PrefabInstance: {fileID: 7717335971750466713} - m_PrefabAsset: {fileID: 0} --- !u!224 &2195415561721556952 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} m_PrefabInstance: {fileID: 7717335971750466713} m_PrefabAsset: {fileID: 0} +--- !u!1 &4044924788262064527 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} + m_PrefabInstance: {fileID: 7717335971750466713} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8329023202578667452 PrefabInstance: m_ObjectHideFlags: 0 @@ -6662,13 +6814,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} ---- !u!1 &2354727283849138858 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} - m_PrefabInstance: {fileID: 8329023202578667452} - m_PrefabAsset: {fileID: 0} --- !u!224 &502275081594006781 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} m_PrefabInstance: {fileID: 8329023202578667452} m_PrefabAsset: {fileID: 0} +--- !u!1 &2354727283849138858 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} + m_PrefabInstance: {fileID: 8329023202578667452} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab index 4043e86e5..cd5e52880 100644 --- a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab +++ b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab @@ -432,7 +432,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -746,7 +746,7 @@ MonoBehaviour: m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0