diff --git a/Assets/ResWork/Table/Export/Localization.json b/Assets/ResWork/Table/Export/Localization.json index e9dd3c271..c53c48e86 100644 --- a/Assets/ResWork/Table/Export/Localization.json +++ b/Assets/ResWork/Table/Export/Localization.json @@ -50,8 +50,7 @@ 제거된 씨앗은 사라집니다. 계속하시겠습니까?", "s_English": "", "exception": ""}, {"ID": "168", "s_Korean": "솥에 넣을 작물을 선택해 주세요.", "s_English": "", "exception": ""}, {"ID": "169", "s_Korean": "원하는 작물을 선택해 주세요.", "s_English": "", "exception": ""}, {"ID": "170", "s_Korean": "조제 : {0}", "s_English": "", "exception": ""}, {"ID": "171", "s_Korean": "보호막이 있거나 전투불능인 상태입니다.", "s_English": "", "exception": ""}, {"ID": "172", "s_Korean": "최종 데미지 : {0}", "s_English": "", "exception": ""}, {"ID": "173", "s_Korean": "남은 구매횟수가 없습니다.", "s_English": "", "exception": ""}, {"ID": "174", "s_Korean": "{0}", "s_English": "{0}", "exception": ""}, {"ID": "175", "s_Korean": "가이드 퀘스트 {0} 완료 후 입장 가능", "s_English": "", "exception": ""}, {"ID": "176", "s_Korean": "{0} {1:N0}개를 획득했습니다.", "s_English": "", "exception": ""}, {"ID": "177", "s_Korean": "공지사항", "s_English": "", "exception": ""}, {"ID": "178", "s_Korean": "이벤트", "s_English": "", "exception": ""}, {"ID": "179", "s_Korean": "패스", "s_English": "", "exception": ""}, {"ID": "180", "s_Korean": "출석", "s_English": "", "exception": ""}, {"ID": "181", "s_Korean": "뽑기", "s_English": "", "exception": ""}, {"ID": "182", "s_Korean": "상점", "s_English": "", "exception": ""}, {"ID": "183", "s_Korean": "우편", "s_English": "", "exception": ""}, {"ID": "184", "s_Korean": "퀵메뉴", "s_English": "", "exception": ""}, {"ID": "185", "s_Korean": "착용", "s_English": "", "exception": ""}, {"ID": "186", "s_Korean": "영웅관리", "s_English": "", "exception": ""}, {"ID": "187", "s_Korean": "채팅", "s_English": "", "exception": ""}, {"ID": "188", "s_Korean": "알림", "s_English": "", "exception": ""}, {"ID": "189", "s_Korean": "로그", "s_English": "", "exception": ""}, {"ID": "190", "s_Korean": "차단목록", "s_English": "", "exception": ""}, {"ID": "191", "s_Korean": "장비", "s_English": "", "exception": ""}, {"ID": "192", "s_Korean": "강화", "s_English": "", "exception": ""}, {"ID": "193", "s_Korean": "숙련 보너스 {0}%", "s_English": "", "exception": ""}, {"ID": "194", "s_Korean": "숙련도 강화", "s_English": "", "exception": ""}, {"ID": "195", "s_Korean": "제작 목록", "s_English": "", "exception": ""}, {"ID": "196", "s_Korean": "제작", "s_English": "", "exception": ""}, {"ID": "197", "s_Korean": "제련 효과", "s_English": "", "exception": ""}, {"ID": "198", "s_Korean": "제련 확률", "s_English": "", "exception": ""}, {"ID": "199", "s_Korean": "제련", "s_English": "", "exception": ""}, {"ID": "200", "s_Korean": "분해", "s_English": "", "exception": ""}, {"ID": "201", "s_Korean": "숙련 보너스 -{0}%", "s_English": "", "exception": ""}, {"ID": "202", "s_Korean": "Lv.{0} 달성 시 개방", "s_English": "", "exception": ""}, {"ID": "203", "s_Korean": "인챈트를 부여해 주세요.", "s_English": "", "exception": ""}, {"ID": "204", "s_Korean": "보유량 -{0}", "s_English": "", "exception": ""}, {"ID": "205", "s_Korean": "정보", "s_English": "", "exception": ""}, {"ID": "206", "s_Korean": "마법 +{0}%", "s_English": "", "exception": ""}, {"ID": "202", "s_Korean": "Lv.{0} 달성 시 개방", "s_English": "", "exception": ""}, {"ID": "203", "s_Korean": "인챈트를 부여해 주세요.", "s_English": "", "exception": ""}, {"ID": "204", "s_Korean": "보유량 {0}", "s_English": "", "exception": ""}, {"ID": "205", "s_Korean": "정보", "s_English": "", "exception": ""}, {"ID": "206", "s_Korean": "마법 부여", "s_English": "", "exception": ""}, {"ID": "207", "s_Korean": "착용중", "s_English": "", "exception": ""}, {"ID": "208", "s_Korean": "미보유", "s_English": "", "exception": ""}, {"ID": "209", "s_Korean": "스킬", "s_English": "", "exception": ""}, {"ID": "210", "s_Korean": "기본 공격", "s_English": "", "exception": ""}, {"ID": "211", "s_Korean": "회피", "s_English": "", "exception": ""}, {"ID": "212", "s_Korean": "각성 효과", "s_English": "", "exception": ""}, {"ID": "213", "s_Korean": "스킬 목록", "s_English": "", "exception": ""}, {"ID": "214", "s_Korean": "직업 스킬", "s_English": "", "exception": ""}, {"ID": "215", "s_Korean": "액티브 스킬", "s_English": "", "exception": ""}, {"ID": "216", "s_Korean": "패시브 스킬", "s_English": "", "exception": ""}, {"ID": "217", "s_Korean": "각성", "s_English": "", "exception": ""}, {"ID": "218", "s_Korean": "Lv.{0} 강화 효과", "s_English": "", "exception": ""}, {"ID": "219", "s_Korean": "프리셋1", "s_English": "", "exception": ""}, {"ID": "220", "s_Korean": "프리셋2", "s_English": "", "exception": ""}, {"ID": "221", "s_Korean": "프리셋3", "s_English": "", "exception": ""}, {"ID": "222", "s_Korean": "펫", "s_English": "", "exception": ""}, {"ID": "223", "s_Korean": "스탯 관리", "s_English": "", "exception": ""}, {"ID": "224", "s_Korean": "상세 정보", "s_English": "", "exception": ""}, {"ID": "225", "s_Korean": "스탯을 초기화 하시겠습니까?", "s_English": "", "exception": ""}, {"ID": "226", "s_Korean": "포인트", "s_English": "", "exception": ""}, {"ID": "227", "s_Korean": "정보", "s_English": "", "exception": ""}, {"ID": "228", "s_Korean": "특성", "s_English": "", "exception": ""}, {"ID": "229", "s_Korean": "전직", "s_English": "", "exception": ""}, {"ID": "230", "s_Korean": "각성 단계가 부족합니다.", "s_English": "", "exception": ""}, {"ID": "231", "s_Korean": "초월", "s_English": "", "exception": ""}, {"ID": "232", "s_Korean": "직업 복장", "s_English": "", "exception": ""}, {"ID": "233", "s_Korean": "스페셜 복장", "s_English": "", "exception": ""}, {"ID": "234", "s_Korean": "콜렉션", "s_English": "", "exception": ""}, {"ID": "235", "s_Korean": "특성을 강화하려면 선행 조건이 만족되어야 합니다.", "s_English": "", "exception": ""}, {"ID": "236", "s_Korean": "더 이상 레벨을 올릴 수 없습니다.", "s_English": "", "exception": ""}, {"ID": "237", "s_Korean": "특성을 초기화 하시겠습니까?", "s_English": "", "exception": ""}, {"ID": "238", "s_Korean": "패시브", "s_English": "", "exception": ""}, {"ID": "239", "s_Korean": "고유 스킬", "s_English": "", "exception": ""}, {"ID": "240", "s_Korean": "스탯 보너스", "s_English": "", "exception": ""}, {"ID": "241", "s_Korean": "전직 조건", "s_English": "", "exception": ""}, {"ID": "242", "s_Korean": "특성 {0} 필요", "s_English": "", "exception": ""}, {"ID": "243", "s_Korean": "조건 없음", "s_English": "", "exception": ""}, {"ID": "244", "s_Korean": "선택중", "s_English": "", "exception": ""}, {"ID": "245", "s_Korean": "변경", "s_English": "", "exception": ""}, {"ID": "246", "s_Korean": "전직", "s_English": "", "exception": ""}, {"ID": "247", "s_Korean": "스탯 정보", "s_English": "", "exception": ""}, {"ID": "248", "s_Korean": "영웅 관리", "s_English": "", "exception": ""}, {"ID": "249", "s_Korean": "각성 {0} 필요", "s_English": "", "exception": ""}, {"ID": "250", "s_Korean": "클래스 마스터", "s_English": "", "exception": ""}, {"ID": "251", "s_Korean": "클래스를 마스터하면 이하 보상을 획득", "s_English": "", "exception": ""}, {"ID": "252", "s_Korean": "보상", "s_English": "", "exception": ""}, {"ID": "253", "s_Korean": "클래스", "s_English": "", "exception": ""}, {"ID": "254", "s_Korean": "이전 직업이 필요합니다.", "s_English": "", "exception": ""}, {"ID": "255", "s_Korean": "초월 효과", "s_English": "", "exception": ""}, {"ID": "256", "s_Korean": "초월 정보", "s_English": "", "exception": ""}, {"ID": "257", "s_Korean": "각성 레벨 총합", "s_English": "", "exception": ""}, {"ID": "258", "s_Korean": "캐릭터 레벨 달성", "s_English": "", "exception": ""}, {"ID": "259", "s_Korean": "보호 등급 설정", "s_English": "", "exception": ""}, {"ID": "260", "s_Korean": "장비 제련 한계", "s_English": "", "exception": ""}, {"ID": "261", "s_Korean": "현재 적용되는 효과가 없습니다.", "s_English": "", "exception": ""}, {"ID": "262", "s_Korean": "초월 Lv.{0} 달성 시 오픈", "s_English": "", "exception": ""}, {"ID": "263", "s_Korean": "각성 레벨이 부족합니다.", "s_English": "", "exception": ""}, {"ID": "264", "s_Korean": "레벨이 부족합니다.", "s_English": "", "exception": ""}, {"ID": "265", "s_Korean": "보호 등급 이상의 옵션이 있습니다. 변경하시겠습니까?", "s_English": "", "exception": ""}, {"ID": "266", "s_Korean": "제련 한계 레벨이 부족하거나 최대 제련 상태입니다.", "s_English": "", "exception": ""}, {"ID": "267", "s_Korean": "레벨", "s_English": "", "exception": ""}, {"ID": "268", "s_Korean": "출전", "s_English": "", "exception": ""}, {"ID": "269", "s_Korean": "펫 능력치 상세", "s_English": "", "exception": ""}, {"ID": "270", "s_Korean": "영웅 능력치의 {0}", "s_English": "", "exception": ""}, {"ID": "271", "s_Korean": "컬렉션", "s_English": "", "exception": ""}, {"ID": "272", "s_Korean": "정수 연구", "s_English": "", "exception": ""}, {"ID": "273", "s_Korean": "유물 도감", "s_English": "", "exception": ""}, {"ID": "274", "s_Korean": "장비 도감", "s_English": "", "exception": ""}, {"ID": "275", "s_Korean": "몬스터 도감", "s_English": "", "exception": ""}, {"ID": "276", "s_Korean": "마녀의 고서 diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index c1a5ec9a9..1be6a6c0f 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UI/Image/Equipment/circle button.png b/Assets/ResWork/UI/Image/Equipment/circle button.png new file mode 100644 index 000000000..a37e9be1c Binary files /dev/null and b/Assets/ResWork/UI/Image/Equipment/circle button.png differ diff --git a/Assets/ResWork/UI/Image/Equipment/circle button.png.meta b/Assets/ResWork/UI/Image/Equipment/circle button.png.meta new file mode 100644 index 000000000..9c9d44195 --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/circle button.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 47fb62d0733f2fb4d9d44d7acf2b570c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Equipment/enchant icon lock.png b/Assets/ResWork/UI/Image/Equipment/enchant icon lock.png new file mode 100644 index 000000000..f1e1c26d2 Binary files /dev/null and b/Assets/ResWork/UI/Image/Equipment/enchant icon lock.png differ diff --git a/Assets/ResWork/UI/Image/Equipment/enchant icon lock.png.meta b/Assets/ResWork/UI/Image/Equipment/enchant icon lock.png.meta new file mode 100644 index 000000000..afc7e22e9 --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/enchant icon lock.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: b7db96463905a58409bd9b8bd405d585 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Equipment/enchant icon unlock.png b/Assets/ResWork/UI/Image/Equipment/enchant icon unlock.png new file mode 100644 index 000000000..9159d6034 Binary files /dev/null and b/Assets/ResWork/UI/Image/Equipment/enchant icon unlock.png differ diff --git a/Assets/ResWork/UI/Image/Equipment/enchant icon unlock.png.meta b/Assets/ResWork/UI/Image/Equipment/enchant icon unlock.png.meta new file mode 100644 index 000000000..12881bb92 --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/enchant icon unlock.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: fa1460b3f1e39ed45874b81ab0f82cb5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Equipment/magnifying glass button.png b/Assets/ResWork/UI/Image/Equipment/magnifying glass button.png new file mode 100644 index 000000000..29f66ede4 Binary files /dev/null and b/Assets/ResWork/UI/Image/Equipment/magnifying glass button.png differ diff --git a/Assets/ResWork/UI/Image/Equipment/magnifying glass button.png.meta b/Assets/ResWork/UI/Image/Equipment/magnifying glass button.png.meta new file mode 100644 index 000000000..7ce50eea7 --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/magnifying glass button.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: cc0b184f2de613a439dcab33743d54ab +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Equipment/magnifying glass icon.png b/Assets/ResWork/UI/Image/Equipment/magnifying glass icon.png new file mode 100644 index 000000000..ada437f84 Binary files /dev/null and b/Assets/ResWork/UI/Image/Equipment/magnifying glass icon.png differ diff --git a/Assets/ResWork/UI/Image/Equipment/magnifying glass icon.png.meta b/Assets/ResWork/UI/Image/Equipment/magnifying glass icon.png.meta new file mode 100644 index 000000000..3171e7bdc --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/magnifying glass icon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 0dc47c9224d9ed04290381ceadd0038a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Lobby/guage-bar-white.png.meta b/Assets/ResWork/UI/Image/Lobby/guage-bar-white.png.meta index adfda550a..d92ff0cc5 100644 --- a/Assets/ResWork/UI/Image/Lobby/guage-bar-white.png.meta +++ b/Assets/ResWork/UI/Image/Lobby/guage-bar-white.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 8, y: 0, z: 8, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -139,7 +139,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/ResWork/UIPrefabs/Equipment/EquipmentEnchantCard.prefab b/Assets/ResWork/UIPrefabs/Equipment/EquipmentEnchantCard.prefab index 884f2807b..eb9933084 100644 --- a/Assets/ResWork/UIPrefabs/Equipment/EquipmentEnchantCard.prefab +++ b/Assets/ResWork/UIPrefabs/Equipment/EquipmentEnchantCard.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 6479075702064536891} - component: {fileID: 8465153218149533627} - component: {fileID: 3791413146331386224} + - component: {fileID: 1194667634018545772} m_Layer: 5 m_Name: t_lv m_TagString: Untagged @@ -34,7 +35,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 267, y: -30} + m_AnchoredPosition: {x: 258.2, y: -35.2} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8465153218149533627 @@ -68,7 +69,8 @@ MonoBehaviour: m_text: Lv.00 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -92,17 +94,17 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -134,81 +136,21 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1526469537900259927 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3646247786747832226} - - component: {fileID: 2823480649591075238} - - component: {fileID: 5290045751157449051} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3646247786747832226 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1526469537900259927} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6874656135904827572} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2823480649591075238 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1526469537900259927} - m_CullTransparentMesh: 1 ---- !u!114 &5290045751157449051 +--- !u!114 &1194667634018545772 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1526469537900259927} + m_GameObject: {fileID: 957599398630325137} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: c85b993cb9256254fb4216b695f3bb69, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.16862746, g: 0.21568629, b: 0.29803923, 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: 65f581562538e304cbbfe8ee3beab09c, 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 + textMeshPro: {fileID: 6679257501196929870} + icon: {fileID: 6479075702064536891} + RightOffset: 0.5 --- !u!1 &1986426900505485924 GameObject: m_ObjectHideFlags: 0 @@ -243,7 +185,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 180, y: -30} + m_AnchoredPosition: {x: 185.9, y: -32.2} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &850716815625104454 @@ -277,7 +219,8 @@ MonoBehaviour: m_text: "\uD30C\uAD34" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -379,6 +322,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3252665387665059587 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1841248421292686207} + - component: {fileID: 4447841115020297390} + - component: {fileID: 6646016525599314410} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1841248421292686207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3252665387665059587} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3090926410994494640} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 32, y: 33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4447841115020297390 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3252665387665059587} + m_CullTransparentMesh: 1 +--- !u!114 &6646016525599314410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3252665387665059587} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 0dc47c9224d9ed04290381ceadd0038a, 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 &3307604200073022425 GameObject: m_ObjectHideFlags: 0 @@ -448,7 +466,8 @@ MonoBehaviour: m_text: "\uAC15\uD654" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -472,8 +491,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -564,8 +583,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -43, y: 0} - m_SizeDelta: {x: 70, y: 70} + m_AnchoredPosition: {x: -87.38, y: -13.02} + m_SizeDelta: {x: 115.56, y: 52.84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3183645531583676071 CanvasRenderer: @@ -595,8 +614,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0575e0b3d46c8464e988ae680599089f, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -708,8 +727,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 45, y: 0} - m_SizeDelta: {x: 90, y: 90} + m_AnchoredPosition: {x: 42.96, y: 1.7} + m_SizeDelta: {x: 85.92, y: 86.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2977276077896575668 CanvasRenderer: @@ -739,7 +758,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bef3dc2835f849e40b7ca16ad1691b80, type: 3} + m_Sprite: {fileID: 21300000, guid: fc01b16d6a28db648b3d8e3b13e044eb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -781,13 +800,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1841248421292686207} - {fileID: 4235481618824535414} m_Father: {fileID: 6874656135904827572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 100, y: 0} - m_SizeDelta: {x: 70, y: 70} + m_AnchoredPosition: {x: 22.5, y: 3.7} + m_SizeDelta: {x: 58, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3990443502736951463 CanvasRenderer: @@ -817,8 +837,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 043eec3bab8b14540aa8158837c6af73, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: cc0b184f2de613a439dcab33743d54ab, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -930,8 +950,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -69, y: -23} - m_SizeDelta: {x: 235, y: 20} + m_AnchoredPosition: {x: -103.42, y: -14.45} + m_SizeDelta: {x: 163.04, y: 28.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5574210549868064120 MonoBehaviour: @@ -980,10 +1000,85 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0.5 + m_Value: 1 m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &5430226224819796035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1148840016532261244} + - component: {fileID: 3030952732397488274} + - component: {fileID: 1551326743990842257} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1148840016532261244 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5430226224819796035} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6874656135904827572} + 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: -16.52, y: -5.7} + m_SizeDelta: {x: 580, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3030952732397488274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5430226224819796035} + m_CullTransparentMesh: 1 +--- !u!114 &1551326743990842257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5430226224819796035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 9aa7a5f2db51006418768da92b079a2c, 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 &5623210799503222151 GameObject: m_ObjectHideFlags: 0 @@ -1021,8 +1116,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -43, y: 0} - m_SizeDelta: {x: 70, y: 70} + m_AnchoredPosition: {x: -87.38, y: -13.02} + m_SizeDelta: {x: 115.56, y: 52.84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &963329544045598298 CanvasRenderer: @@ -1052,8 +1147,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d8f5c3477d7a6e641b65895bd0654b91, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dd90e66f8e2c28e4ea2a7d7af3546124, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1195,8 +1290,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 4a8a5cbe5a64a164891abcd4b8c1d4bb, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1239,7 +1334,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 173, y: 0} + m_AnchoredPosition: {x: 212.6, y: 28.4} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3880464488411245014 @@ -1270,10 +1365,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uBCF4\uC720\uB7C9\n000" + m_text: "\uBCF4\uC720\uB7C9 000" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1368,7 +1464,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3646247786747832226} - {fileID: 3369205577962088403} - {fileID: 4467969763287648289} - {fileID: 6479075702064536891} @@ -1377,6 +1472,7 @@ RectTransform: - {fileID: 6365768244022819686} - {fileID: 3577846838859704223} - {fileID: 3948129504853826912} + - {fileID: 1148840016532261244} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1472,10 +1568,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uB9C8\uBC95\n\uBD80\uC5EC" + m_text: "\uB9C8\uBC95 \uBD80\uC5EC" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1499,8 +1596,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -1509,7 +1606,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -1586,10 +1683,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3369205577962088403} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 66, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8410595663443104172 CanvasRenderer: @@ -1619,7 +1716,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 52da489232807d84db200becff1dac83, type: 3} + m_Sprite: {fileID: 21300000, guid: fa1460b3f1e39ed45874b81ab0f82cb5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1664,7 +1761,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -6, y: -8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8468763838564507699 CanvasRenderer: @@ -1687,15 +1784,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + 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: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c7add517d7e8c6a4b8d3dc8e02024ed2, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1739,7 +1836,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -28.7} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6305801355370337349 @@ -1773,7 +1870,8 @@ MonoBehaviour: m_text: "\uC815\uBCF4" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1797,8 +1895,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 17 + m_fontSizeBase: 17 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 9c3f46ff2..63685383c 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -24072,7 +24072,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5339096967500496420 RectTransform: m_ObjectHideFlags: 0 @@ -24088,10 +24088,10 @@ RectTransform: - {fileID: 2448451856311040343} m_Father: {fileID: 2579632502600516791} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 298.44922, y: -50.160156} - m_SizeDelta: {x: -694.9, y: -195.2} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -361.96, y: -93.81} + m_SizeDelta: {x: 625.91, y: 797.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3560866476004612014 MonoBehaviour: @@ -45589,7 +45589,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 14.49 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -78822,7 +78822,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b5f82ab03360cd048b239673a417964f, type: 3} + m_Sprite: {fileID: 21300000, guid: 36dbe03159568764fbbda4ff197e1069, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1