diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 74864f19c..8fe749cda 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -77,7 +77,7 @@ messageinfo 엄청 느린 버그 아이템 획득 UI 시즌패스 뽑기 - - 펫을 뽑으면 액티브 및 패시브 스킬도 지급 + - 펫을 뽑으면 액티브 및 패시브 스킬도 지급? 랭킹버튼 -> 랭킹 연결 출석부 - 이벤트 (7일) @@ -98,6 +98,5 @@ pc 애님 (캐스팅 추가) 몬스터 소환은 트리거로 - 트리거 닿으면 그때 소환? -장비 슬롯 UI 테스트씬 만들기 (모험 버튼 위에 테스트 버튼) -빠진 UI 문서화해서 전달 \ No newline at end of file +장비 슬롯 UI diff --git a/Assets/ResWork/Table/Export/Localization.json b/Assets/ResWork/Table/Export/Localization.json index 45037133c..0f8ef9d9c 100644 --- a/Assets/ResWork/Table/Export/Localization.json +++ b/Assets/ResWork/Table/Export/Localization.json @@ -48,9 +48,7 @@ {0}", "s_English": "", "exception": ""}, {"ID": "150", "s_Korean": "닉네임이 변경되었습니다.", "s_English": "", "exception": ""}, {"ID": "151", "s_Korean": "이미 사용중인 닉네임 혹은 사용할 수 없는 닉네임입니다.", "s_English": "", "exception": ""}, {"ID": "152", "s_Korean": "최초 무료", "s_English": "", "exception": ""}, {"ID": "153", "s_Korean": "현재 사용중인 닉네임입니다.", "s_English": "", "exception": ""}, {"ID": "154", "s_Korean": "닉네임을 입력해 주세요.", "s_English": "", "exception": ""}, {"ID": "155", "s_Korean": "빈 공간이 있으면 안됩니다.", "s_English": "", "exception": ""}, {"ID": "156", "s_Korean": "한글, 숫자, 영어만 가능합니다.", "s_English": "", "exception": ""}, {"ID": "157", "s_Korean": "3~12자까지 가능합니다.", "s_English": "", "exception": ""}, {"ID": "158", "s_Korean": "금지 단어가 포함되어 있습니다.", "s_English": "", "exception": ""}, {"ID": "159", "s_Korean": "수확하기", "s_English": "", "exception": ""}, {"ID": "160", "s_Korean": "{0}(이)가 부족합니다.", "s_English": "", "exception": ""}, {"ID": "161", "s_Korean": "가이드 퀘스트가 완료 되었습니다. 보상을 받아주세요.", "s_English": "", "exception": ""}, {"ID": "162", "s_Korean": "동의합니다", "s_English": "", "exception": ""}, {"ID": "163", "s_Korean": "계정 삭제에 동의하지 않으셨습니다.", "s_English": "", "exception": ""}, {"ID": "164", "s_Korean": "프리셋이 {0}번으로 변경되었습니다.", "s_English": "", "exception": ""}, {"ID": "165", "s_Korean": "씨앗 심기 완료!", "s_English": "", "exception": ""}, {"ID": "166", "s_Korean": "마법 사용 쿨타임입니다.", "s_English": "", "exception": ""}, {"ID": "167", "s_Korean": "씨앗을 제거합니다. 제거된 씨앗은 사라집니다. -계속하시겠습니까?", "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": "마법 +계속하시겠습니까?", "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": "숙련 보너스", "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": "", "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 4ccdb0b30..1c83c5965 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/btn_equipment_round.png b/Assets/ResWork/UI/Image/Equipment/btn_equipment_round.png new file mode 100644 index 000000000..3a49f2994 Binary files /dev/null and b/Assets/ResWork/UI/Image/Equipment/btn_equipment_round.png differ diff --git a/Assets/ResWork/UI/Image/Equipment/btn_equipment_round.png.meta b/Assets/ResWork/UI/Image/Equipment/btn_equipment_round.png.meta new file mode 100644 index 000000000..59f421439 --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/btn_equipment_round.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: fc76ef4c71e44574bade4c40a18afd92 +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: 30, y: 0, z: 30, 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UI/Image/Equipment/equipment line window.png b/Assets/ResWork/UI/Image/Equipment/equipment line window.png new file mode 100644 index 000000000..4f895fd1f Binary files /dev/null and b/Assets/ResWork/UI/Image/Equipment/equipment line window.png differ diff --git a/Assets/ResWork/UI/Image/Equipment/equipment line window.png.meta b/Assets/ResWork/UI/Image/Equipment/equipment line window.png.meta new file mode 100644 index 000000000..5c602ca06 --- /dev/null +++ b/Assets/ResWork/UI/Image/Equipment/equipment line window.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: fcd67cce7524df543b52beba7b1ee908 +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: 19, y: 18, z: 19, w: 16} + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index ec29fbc2b..913ab38bd 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -1844,83 +1844,6 @@ MonoBehaviour: TextCol_off: {r: 1, g: 1, b: 1, a: 1} texts: - {fileID: 6986174286048149442} ---- !u!1 &136197842631591818 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4745500262800885451} - - component: {fileID: 4197477052041017526} - - component: {fileID: 2682291262681763971} - 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 &4745500262800885451 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 136197842631591818} - 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: - - {fileID: 5905508171948066065} - - {fileID: 4068859546795610476} - m_Father: {fileID: 9141830281980558084} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 34} - m_SizeDelta: {x: -10, y: 44} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4197477052041017526 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 136197842631591818} - m_CullTransparentMesh: 1 ---- !u!114 &2682291262681763971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 136197842631591818} - 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: 0.12941177, g: 0.37254903, b: 0.6039216, 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 --- !u!1 &157756901197820590 GameObject: m_ObjectHideFlags: 0 @@ -4262,10 +4185,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121, y: -333} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3875964648245462270 CanvasRenderer: @@ -4408,7 +4331,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: 75, y: -22} + m_AnchoredPosition: {x: 92.6, y: -24.9} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8867970995235966555 @@ -4467,14 +4390,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: 0 @@ -8481,6 +8404,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &718376574082479301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 394833089699872445} + - component: {fileID: 2408398335747625650} + - component: {fileID: 9160255390551219830} + m_Layer: 5 + m_Name: equipment_stat1val (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &394833089699872445 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718376574082479301} + 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: 8634585392086940796} + 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: 200, y: 194.5} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2408398335747625650 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718376574082479301} + m_CullTransparentMesh: 1 +--- !u!114 &9160255390551219830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718376574082479301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 00(+00) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 35 + m_fontSizeMax: 35 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 12.687866, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &720635521282164590 GameObject: m_ObjectHideFlags: 0 @@ -11970,16 +12028,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1005963531913873702} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 8634585392086940796} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -140} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 75.29999, y: 274.2} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1206899459483852769 @@ -12010,7 +12068,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC0DD\uBA85\uB825 00(+00)" + m_text: "\uC0DD\uBA85\uB825" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -12020,8 +12078,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4280647227 - m_fontColor: {r: 0.23137257, g: 0.49411768, b: 0.14509805, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -12038,12 +12096,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 + m_enableAutoSizing: 1 + m_fontSizeMin: 35 + m_fontSizeMax: 35 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 @@ -12053,8 +12111,8 @@ MonoBehaviour: m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -12189,10 +12247,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121, y: -232} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &987827436419641488 CanvasRenderer: @@ -13027,7 +13085,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2931286266799411332 RectTransform: m_ObjectHideFlags: 0 @@ -13252,7 +13310,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC0DD\uBA85\uB825 00(+00)" + m_text: "\uC0DD\uBA85\uB825" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -14035,7 +14093,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1219382199740196893} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -14044,7 +14102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 10, y: 34} + m_AnchoredPosition: {x: 9.49999, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8906532018122385088 @@ -14099,6 +14157,7 @@ GameObject: - component: {fileID: 1359785412533675461} - component: {fileID: 7406728587081012930} - component: {fileID: 2983495224188318781} + - component: {fileID: 8911074232207324119} m_Layer: 5 m_Name: t_bonus m_TagString: Untagged @@ -14113,16 +14172,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1221684535401532423} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 8634585392086940796} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -93, y: -178} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 75.100006, y: 151.6} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7406728587081012930 @@ -14153,7 +14212,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC219\uB828 \uBCF4\uB108\uC2A4\n00%" + m_text: "\uC219\uB828 \uBCF4\uB108\uC2A4 " m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -14163,8 +14222,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -14181,14 +14240,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: 0 @@ -14223,6 +14282,19 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &8911074232207324119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221684535401532423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 193 --- !u!1 &1224496849327256844 GameObject: m_ObjectHideFlags: 0 @@ -14939,17 +15011,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1245135207291295433} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4745500262800885451} + m_Father: {fileID: 9141830281980558084} 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: 15, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 60, y: 0.6} + m_SizeDelta: {x: 31, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7680158303401442444 CanvasRenderer: @@ -14979,7 +15051,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 11333b0ea6cba0e4fae25368e1a359d8, type: 3} + m_Sprite: {fileID: 21300000, guid: ef2f236867771cd469960f298349af98, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15098,7 +15170,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: -7.4999995, y: 0} + m_AnchoredPosition: {x: -12.3, y: 0} m_SizeDelta: {x: -15, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7438181813885832800 @@ -15129,7 +15201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0000+00 + m_text: 0000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -15139,8 +15211,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -15157,8 +15229,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -15167,7 +15239,7 @@ MonoBehaviour: m_HorizontalAlignment: 4 m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -16994,7 +17066,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC0DD\uBA85\uB825 00(+00)" + m_text: "\uC0DD\uBA85\uB825" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -17456,9 +17528,9 @@ RectTransform: - {fileID: 1156520485920347372} m_Father: {fileID: 4546882025923078743} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 197.84, y: 0} m_SizeDelta: {x: 116.24, y: 110.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5502611037725276666 @@ -20746,6 +20818,141 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 225 +--- !u!1 &1767487050083540368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6593583435787147455} + - component: {fileID: 8456121567373297509} + - component: {fileID: 861843164320250859} + m_Layer: 5 + m_Name: equipment_stat1val (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6593583435787147455 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767487050083540368} + 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: 8634585392086940796} + 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: 200, y: 235.7} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8456121567373297509 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767487050083540368} + m_CullTransparentMesh: 1 +--- !u!114 &861843164320250859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767487050083540368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 00(+00) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 35 + m_fontSizeMax: 35 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 12.687866, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1767820362879721745 GameObject: m_ObjectHideFlags: 0 @@ -21089,19 +21296,23 @@ MonoBehaviour: - {fileID: 4314144591713291840} - {fileID: 5191376999915687277} - {fileID: 8694880169940852197} - - {fileID: 3242865309429803375} + - {fileID: 7184071812203545440} texts_stat: - {fileID: 7740150136433484086} - - {fileID: 76138301342379348} - - {fileID: 348935950173989978} + - {fileID: 4433014206147960479} + - {fileID: 146568815665256781} + texts_statval: + - {fileID: 876794056877934446} + - {fileID: 861843164320250859} + - {fileID: 9160255390551219830} images_iteminfo: - {fileID: 2700283499472520128} - {fileID: 4824347313821733718} - - {fileID: 3639185779888269057} - m_rect: {fileID: 8634585392086940796} + - {fileID: 926267739904920809} + m_childrect: {fileID: 8634585392086940796} m_EquipItemEnchantOption: {fileID: 915230642887761120} texts: - - {fileID: 2983495224188318781} + - {fileID: 4907950681864715439} - {fileID: 8503743008818912828} - {fileID: 4275555411572985464} - {fileID: 8510178262727087618} @@ -21175,7 +21386,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC0DD\uBA85\uB825 00(+00)" + m_text: "\uC0DD\uBA85\uB825" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -26495,9 +26706,9 @@ RectTransform: - {fileID: 6185809200227087122} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 34.365, y: -34.98} m_SizeDelta: {x: 68.73, y: 69.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4656096652649122635 @@ -26935,7 +27146,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099416491742164138} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -26944,20 +27155,25 @@ RectTransform: - {fileID: 3883114996825519191} - {fileID: 3816749587334631333} - {fileID: 856624802769462676} - - {fileID: 4550984448785090684} - - {fileID: 8196376754071509141} - - {fileID: 1341260498066487908} + - {fileID: 6916682999773835166} + - {fileID: 81604835438087415} + - {fileID: 9044877642550679623} + - {fileID: 6593583435787147455} + - {fileID: 394833089699872445} - {fileID: 1359785412533675461} + - {fileID: 6554402136384716422} - {fileID: 8350210740728325229} + - {fileID: 943356049869168462} - {fileID: 1669899500525413960} + - {fileID: 6232058419957305920} - {fileID: 8070832553226995717} - {fileID: 3347043973186358126} m_Father: {fileID: 8100369104258755438} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 312.5, y: 0} - m_SizeDelta: {x: -655, y: -30} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 545.5001, y: -84.75} + m_SizeDelta: {x: 655, y: 838.81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1023873313136047122 CanvasRenderer: @@ -26987,7 +27203,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3} + m_Sprite: {fileID: 21300000, guid: 68b2f4743be214445b585c759ff3e368, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -27517,8 +27733,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: 70, y: 0} - m_SizeDelta: {x: 100, y: 50} + m_AnchoredPosition: {x: 170.4, y: -0.18} + m_SizeDelta: {x: 99.24, y: 42.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8912316303778163018 CanvasRenderer: @@ -27541,14 +27757,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.49411768, b: 0.14509805, 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_Sprite: {fileID: 21300000, guid: fc01b16d6a28db648b3d8e3b13e044eb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -27929,10 +28145,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -30} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1025175467207679131 CanvasRenderer: @@ -33718,7 +33934,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: 245, y: -22} + m_AnchoredPosition: {x: 246.2, y: -26.1} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1682560462412212695 @@ -33777,8 +33993,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -35141,7 +35357,7 @@ RectTransform: 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: -23.3} + m_AnchoredPosition: {x: 73.7, y: -30.6} m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4713980666256748504 @@ -35330,141 +35546,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2783751676122840607 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3740181708585025184} - - component: {fileID: 4570337621492964334} - - component: {fileID: 3242865309429803375} - m_Layer: 5 - m_Name: t_itemtype - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3740181708585025184 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2783751676122840607} - 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: 1341260498066487908} - 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: 105, y: 0} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4570337621492964334 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2783751676122840607} - m_CullTransparentMesh: 1 ---- !u!114 &3242865309429803375 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2783751676122840607} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uD0C0\uC785" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2785771500466844372 GameObject: m_ObjectHideFlags: 0 @@ -35527,7 +35608,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2788628294143003337} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -35536,7 +35617,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: 210, y: -97} + m_AnchoredPosition: {x: 209.49998, y: -97} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3074368417375713111 @@ -37736,7 +37817,7 @@ RectTransform: m_Father: {fileID: 925291058961817483} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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} @@ -38628,9 +38709,9 @@ RectTransform: - {fileID: 8627581003307384079} m_Father: {fileID: 4546882025923078743} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -66.64, y: 0} m_SizeDelta: {x: 116.24, y: 110.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4326302710291113810 @@ -40614,6 +40695,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3158285208293533824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6916682999773835166} + - component: {fileID: 4684179242504002684} + - component: {fileID: 4433014206147960479} + m_Layer: 5 + m_Name: equipment_stat1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6916682999773835166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3158285208293533824} + 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: 8634585392086940796} + 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: 75.29999, y: 235.7} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4684179242504002684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3158285208293533824} + m_CullTransparentMesh: 1 +--- !u!114 &4433014206147960479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3158285208293533824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC0DD\uBA85\uB825" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 35 + m_fontSizeMax: 35 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3162167197133131922 GameObject: m_ObjectHideFlags: 0 @@ -42540,141 +42756,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3315906065450201946 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8196376754071509141} - - component: {fileID: 5372140225741698362} - - component: {fileID: 348935950173989978} - m_Layer: 5 - m_Name: equipment_stat3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8196376754071509141 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3315906065450201946} - 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: 8634585392086940796} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -192.7998} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5372140225741698362 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3315906065450201946} - m_CullTransparentMesh: 1 ---- !u!114 &348935950173989978 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3315906065450201946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC0DD\uBA85\uB825 00(+00)" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4280647227 - m_fontColor: {r: 0.23137257, g: 0.49411768, b: 0.14509805, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3330187607469626755 GameObject: m_ObjectHideFlags: 0 @@ -44653,10 +44734,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -232} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4520777005139245164 CanvasRenderer: @@ -46658,7 +46739,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3586848015110636817} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -46669,10 +46750,10 @@ RectTransform: - {fileID: 9141830281980558084} m_Father: {fileID: 8634585392086940796} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 60} - m_SizeDelta: {x: -40, y: 100} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -3.630005, y: -258.84} + m_SizeDelta: {x: 547.14, y: 51.70999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4167439831358174932 CanvasRenderer: @@ -46695,14 +46776,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, 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: 4204c252fcbac504e8a50f23a3420d1d, type: 3} + m_Sprite: {fileID: 21300000, guid: fcd67cce7524df543b52beba7b1ee908, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -48120,9 +48201,9 @@ RectTransform: - {fileID: 5070997152126263843} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 38.1, y: -38.26} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6794977624464831537 @@ -48843,7 +48924,7 @@ RectTransform: m_Father: {fileID: 3850105965408971949} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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} @@ -49908,6 +49989,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: label_curTime: {fileID: 6052269720914502553} +--- !u!1 &3858042661848568718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8242544032741082316} + - component: {fileID: 2075471496425372512} + - component: {fileID: 926267739904920809} + m_Layer: 5 + m_Name: i_itemtype + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8242544032741082316 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858042661848568718} + 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: 1341260498066487908} + 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: 0} + m_SizeDelta: {x: 17.5, y: 21} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2075471496425372512 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858042661848568718} + m_CullTransparentMesh: 1 +--- !u!114 &926267739904920809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858042661848568718} + 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: 5afcddbc5badac54b804abbb9e94c231, 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 &3881666577567968128 GameObject: m_ObjectHideFlags: 0 @@ -50460,6 +50616,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &3908928347147698262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3139997674705862965} + - component: {fileID: 6988094120482160106} + - component: {fileID: 5433684367954337685} + m_Layer: 5 + m_Name: statval3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3139997674705862965 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3908928347147698262} + 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: 1929293313172071507} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 476, y: -199} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6988094120482160106 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3908928347147698262} + m_CullTransparentMesh: 1 +--- !u!114 &5433684367954337685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3908928347147698262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC0DD\uBA85\uB825" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3923636244384290382 GameObject: m_ObjectHideFlags: 0 @@ -51323,12 +51614,13 @@ RectTransform: - {fileID: 8451130532762229147} - {fileID: 1673230850899837566} - {fileID: 6155941232118187210} + - {fileID: 1341260498066487908} m_Father: {fileID: 8634585392086940796} 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: -32.65918} - m_SizeDelta: {x: 624, y: 65.32001} + m_AnchoredPosition: {x: -0.4999981, y: -53.02002} + m_SizeDelta: {x: 624, y: 57.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &911258667049782498 CanvasRenderer: @@ -51351,15 +51643,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.050980397, g: 0.20784315, b: 0.07450981, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 27d815cb916e1544fb3418dab2c89f49, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -52252,6 +52544,81 @@ RectTransform: m_AnchoredPosition: {x: 151, y: -483} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4075702757271131607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6232058419957305920} + - component: {fileID: 8336204416503304563} + - component: {fileID: 6897017265205879437} + m_Layer: 5 + m_Name: line (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6232058419957305920 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4075702757271131607} + 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: 8634585392086940796} + 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.4999981, y: -207.3} + m_SizeDelta: {x: 538, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8336204416503304563 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4075702757271131607} + m_CullTransparentMesh: 1 +--- !u!114 &6897017265205879437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4075702757271131607} + 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: 2d29b7150b2bb594bae7b2011ed5f9c1, 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 &4079277533361424333 GameObject: m_ObjectHideFlags: 0 @@ -52569,8 +52936,11 @@ RectTransform: - {fileID: 2697403350766445263} - {fileID: 8813601775983850870} - {fileID: 972316426383668212} + - {fileID: 6470212907252286166} - {fileID: 4712866204584516064} + - {fileID: 5617019344656772415} - {fileID: 3247498695070627217} + - {fileID: 3139997674705862965} - {fileID: 3217846209754240021} - {fileID: 179135776788942054} - {fileID: 4152121606644259511} @@ -53543,6 +53913,10 @@ MonoBehaviour: - {fileID: 8398308708002638768} - {fileID: 482266072057423936} - {fileID: 7050661809403677720} + texts_statval: + - {fileID: 3460338733845405274} + - {fileID: 5376771253464450766} + - {fileID: 5433684367954337685} images_iteminfo: - {fileID: 8488676690542667157} - {fileID: 7738023527947199269} @@ -53729,9 +54103,9 @@ RectTransform: - {fileID: 9215642726506370053} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 252.56, y: -38.26} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6285734242704375772 @@ -55222,7 +55596,7 @@ RectTransform: m_Father: {fileID: 1406900139135982907} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.412, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -56031,6 +56405,141 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 182 +--- !u!1 &4366464899676107042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 81604835438087415} + - component: {fileID: 2790682029014807953} + - component: {fileID: 146568815665256781} + m_Layer: 5 + m_Name: equipment_stat1 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &81604835438087415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366464899676107042} + 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: 8634585392086940796} + 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: 75.29999, y: 194.5} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2790682029014807953 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366464899676107042} + m_CullTransparentMesh: 1 +--- !u!114 &146568815665256781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4366464899676107042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC0DD\uBA85\uB825" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 35 + m_fontSizeMax: 35 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4383509705040295928 GameObject: m_ObjectHideFlags: 0 @@ -57685,7 +58194,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4465787347686829182} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -57695,7 +58204,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: 85, y: -254.2} + m_AnchoredPosition: {x: 213, y: -355} m_SizeDelta: {x: 100, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7864683483315669875 @@ -58184,10 +58693,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -333} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5575149044663304857 CanvasRenderer: @@ -59123,9 +59632,9 @@ RectTransform: - {fileID: 8001933736921823976} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 145.32999, y: -38.26} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4650173689224874701 @@ -59267,6 +59776,141 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &4651678881292971106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1251299840067566769} + - component: {fileID: 1922659767223915412} + - component: {fileID: 6693831424728331374} + m_Layer: 5 + m_Name: t_mainstatafter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1251299840067566769 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4651678881292971106} + 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: 1789353163752731494} + 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: 247, y: -9.4} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1922659767223915412 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4651678881292971106} + m_CullTransparentMesh: 1 +--- !u!114 &6693831424728331374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4651678881292971106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 0% + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279491843 + m_fontColor: {r: 0.011764706, g: 0.8666667, b: 0.07450981, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4654726328413290025 GameObject: m_ObjectHideFlags: 0 @@ -62228,10 +62872,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -131} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7693815851412756338 CanvasRenderer: @@ -63517,8 +64161,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4280021759 + m_fontColor: {r: 1, g: 0.9490196, b: 0.105882354, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -63535,8 +64179,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 - m_fontSizeBase: 25 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -63641,6 +64285,141 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &4997754799227580485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9044877642550679623} + - component: {fileID: 5793161160859453360} + - component: {fileID: 876794056877934446} + m_Layer: 5 + m_Name: equipment_stat1val + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9044877642550679623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4997754799227580485} + 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: 8634585392086940796} + 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: 200, y: 274.2} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5793161160859453360 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4997754799227580485} + m_CullTransparentMesh: 1 +--- !u!114 &876794056877934446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4997754799227580485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 00(+00) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 35 + m_fontSizeMax: 35 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 12.687866, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4998046269588487254 GameObject: m_ObjectHideFlags: 0 @@ -65219,6 +65998,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 21 +--- !u!1 &5144748300358450742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 943356049869168462} + - component: {fileID: 2354389163383941909} + - component: {fileID: 7236270613019694756} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &943356049869168462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144748300358450742} + 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: 8634585392086940796} + 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.4999981, y: 20.2} + m_SizeDelta: {x: 538, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2354389163383941909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144748300358450742} + m_CullTransparentMesh: 1 +--- !u!114 &7236270613019694756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144748300358450742} + 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: 2d29b7150b2bb594bae7b2011ed5f9c1, 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 &5149562761102375723 GameObject: m_ObjectHideFlags: 0 @@ -66246,9 +67100,9 @@ RectTransform: - {fileID: 2834052695919924752} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 425.52002, y: -30.5} m_SizeDelta: {x: 54, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8304982110673110685 @@ -67799,6 +68653,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5409627669435419103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6470212907252286166} + - component: {fileID: 1799520811237949461} + - component: {fileID: 3460338733845405274} + m_Layer: 5 + m_Name: statval1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6470212907252286166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5409627669435419103} + 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: 1929293313172071507} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 476, y: -129.5} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1799520811237949461 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5409627669435419103} + m_CullTransparentMesh: 1 +--- !u!114 &3460338733845405274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5409627669435419103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC0DD\uBA85\uB825" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5410764190926701895 GameObject: m_ObjectHideFlags: 0 @@ -68582,10 +69571,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121, y: -131} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5672886145270032371 CanvasRenderer: @@ -70841,7 +71830,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5685486404411875201} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -70850,10 +71839,10 @@ RectTransform: - {fileID: 7210571913438889843} m_Father: {fileID: 8634585392086940796} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 81} - m_SizeDelta: {x: -40, y: 70} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 119.00995, y: 92.62} + m_SizeDelta: {x: 208.12, y: 46.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1252649723237674931 CanvasRenderer: @@ -70883,8 +71872,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b06875645f1f514391ec9f651113d0a, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e3563905caf7ba145993c4ff242a8e24, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -72227,141 +73216,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &5817297058699261819 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4550984448785090684} - - component: {fileID: 8186798945676697956} - - component: {fileID: 76138301342379348} - m_Layer: 5 - m_Name: equipment_stat2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4550984448785090684 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5817297058699261819} - 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: 8634585392086940796} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -167.40039} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8186798945676697956 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5817297058699261819} - m_CullTransparentMesh: 1 ---- !u!114 &76138301342379348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5817297058699261819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC0DD\uBA85\uB825 00(+00)" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4280647227 - m_fontColor: {r: 0.23137257, g: 0.49411768, b: 0.14509805, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5824346171094209033 GameObject: m_ObjectHideFlags: 0 @@ -75260,10 +76114,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1789353163752731494} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 7.5, y: 0} - m_SizeDelta: {x: -15.000125, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 29.2, y: -9.8} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3731357682464391508 CanvasRenderer: @@ -75303,8 +76157,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -75321,8 +76175,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 25 + m_fontSizeBase: 25 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -79625,7 +80479,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: 7.5, y: 0} + m_AnchoredPosition: {x: 14, y: 0} m_SizeDelta: {x: -15.000125, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5745878110379333504 @@ -79666,8 +80520,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -79684,8 +80538,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -79751,16 +80605,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6488568855099402031} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4745500262800885451} + m_Father: {fileID: 9141830281980558084} 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: 47.6, y: 0} + m_AnchoredPosition: {x: 32.5, y: 0.1} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &951485006656188804 @@ -80811,7 +81665,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f94ed949fa715634484649625aed243f, type: 3} + m_Sprite: {fileID: 21300000, guid: 78af945fa942be249b5a5d3a82c30de6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -84095,8 +84949,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1789353163752731494} - - component: {fileID: 2889843919441191239} - - component: {fileID: 7061953056797191942} m_Layer: 5 m_Name: stat m_TagString: Untagged @@ -84118,6 +84970,8 @@ RectTransform: m_Children: - {fileID: 525288624945821064} - {fileID: 99112198178766986} + - {fileID: 114315484240831234} + - {fileID: 1251299840067566769} m_Father: {fileID: 8070832553226995717} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -84125,44 +84979,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 35} m_SizeDelta: {x: -40, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2889843919441191239 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6891666649053182143} - m_CullTransparentMesh: 1 ---- !u!114 &7061953056797191942 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6891666649053182143} - 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: 4204c252fcbac504e8a50f23a3420d1d, type: 3} - m_Type: 1 - 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 &6895376264283766057 GameObject: m_ObjectHideFlags: 0 @@ -86998,6 +87814,141 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &7142814484974834193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6011257353327431862} + - component: {fileID: 6861154482296346187} + - component: {fileID: 7184071812203545440} + m_Layer: 5 + m_Name: t_itemtype + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6011257353327431862 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7142814484974834193} + 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: 1341260498066487908} + 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: 91.5, y: 0} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6861154482296346187 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7142814484974834193} + m_CullTransparentMesh: 1 +--- !u!114 &7184071812203545440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7142814484974834193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uD0C0\uC785" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7147080095261546903 GameObject: m_ObjectHideFlags: 0 @@ -87031,9 +87982,9 @@ RectTransform: - {fileID: 3353969789094138875} m_Father: {fileID: 4546882025923078743} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -198.88, y: 0} m_SizeDelta: {x: 116.24, y: 110.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3070673849616192957 @@ -88893,9 +89844,9 @@ RectTransform: - {fileID: 1629699223974361622} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 233.62502, y: -34.98} m_SizeDelta: {x: 68.73, y: 69.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5056128966559254441 @@ -93026,7 +93977,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8541309915134075684 RectTransform: m_ObjectHideFlags: 0 @@ -98545,9 +99496,9 @@ RectTransform: - {fileID: 2114765989467969691} m_Father: {fileID: 4546882025923078743} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 65.59999, y: 0} m_SizeDelta: {x: 116.24, y: 110.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &549673083284403424 @@ -101157,13 +102108,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8806006052596745036} - - {fileID: 4745500262800885451} + - {fileID: 5905508171948066065} + - {fileID: 4068859546795610476} m_Father: {fileID: 8070832553226995717} 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: -75, y: 0} - m_SizeDelta: {x: 150, y: 100} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 2.96, y: -94.37} + m_SizeDelta: {x: 255.68, y: 60.03} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6687399780485553811 CanvasRenderer: @@ -101186,14 +102138,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.043137256, g: 0.18823531, b: 0.25490198, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4204c252fcbac504e8a50f23a3420d1d, type: 3} + m_Sprite: {fileID: 21300000, guid: fc76ef4c71e44574bade4c40a18afd92, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -103985,6 +104937,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8476351368482448473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 114315484240831234} + - component: {fileID: 2531850055278141479} + - component: {fileID: 3585997667028297897} + m_Layer: 5 + m_Name: arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &114315484240831234 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8476351368482448473} + 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: 1789353163752731494} + 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: 178.3, y: -8.8} + m_SizeDelta: {x: 19, y: 23} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2531850055278141479 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8476351368482448473} + m_CullTransparentMesh: 1 +--- !u!114 &3585997667028297897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8476351368482448473} + 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: 8db493631a4db344895d6b1251d00c81, 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 &8497292228843683958 GameObject: m_ObjectHideFlags: 0 @@ -106377,7 +107404,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: 0, y: 0} + m_AnchoredPosition: {x: 9.5, y: 0} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9145396371341474867 @@ -106408,7 +107435,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC544\uC774\uD15C \uC774\uB984" + m_text: "\uD574\uACE8 \uC7A5\uAC11" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -106436,12 +107463,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 + m_enableAutoSizing: 1 + m_fontSizeMin: 35 + m_fontSizeMax: 35 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 4096 @@ -106451,7 +107478,7 @@ MonoBehaviour: m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 + m_charWidthMaxAdj: 50 m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 @@ -106472,7 +107499,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -15.33149, y: 0, z: -15.33149, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -106490,7 +107517,7 @@ GameObject: - component: {fileID: 2553684274331850730} - component: {fileID: 3639185779888269057} m_Layer: 5 - m_Name: i_itemtype + m_Name: itemtypebg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -106503,18 +107530,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8663007699575244738} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: - - {fileID: 3740181708585025184} - m_Father: {fileID: 8634585392086940796} + - {fileID: 8242544032741082316} + - {fileID: 6011257353327431862} + m_Father: {fileID: 4047837258339552442} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -101, y: -101} - m_SizeDelta: {x: 45, y: 45} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 116.02, y: -6.59} + m_SizeDelta: {x: 23.49, y: 21.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2553684274331850730 CanvasRenderer: @@ -106544,7 +107572,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 79b8ca635d9d8054192fcfd6c1527c9f, type: 3} + m_Sprite: {fileID: 21300000, guid: 47fb62d0733f2fb4d9d44d7acf2b570c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -106650,6 +107678,141 @@ MonoBehaviour: m_ScrollRect: {fileID: 0} m_Content: {fileID: 1400472963099907056} go_card: {fileID: 1568274442747495661, guid: 9a3ef2c7c45c3b04fa5b3d37418cd361, type: 3} +--- !u!1 &8664021733396147366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5617019344656772415} + - component: {fileID: 8083955913472838637} + - component: {fileID: 5376771253464450766} + m_Layer: 5 + m_Name: statval2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5617019344656772415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664021733396147366} + 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: 1929293313172071507} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 476, y: -164.5} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8083955913472838637 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664021733396147366} + m_CullTransparentMesh: 1 +--- !u!114 &5376771253464450766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664021733396147366} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC0DD\uBA85\uB825" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8669924406722207843 GameObject: m_ObjectHideFlags: 0 @@ -108716,10 +109879,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8520504982765498959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 121, y: -30} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2311960555711157178 CanvasRenderer: @@ -109798,6 +110961,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8891073290269998735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6554402136384716422} + - component: {fileID: 5640275101188154067} + - component: {fileID: 4907950681864715439} + m_Layer: 5 + m_Name: t_bonusval + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6554402136384716422 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8891073290269998735} + 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: 8634585392086940796} + 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: 200, y: 151.6} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5640275101188154067 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8891073290269998735} + m_CullTransparentMesh: 1 +--- !u!114 &4907950681864715439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8891073290269998735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 00% + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279491843 + m_fontColor: {r: 0.011764706, g: 0.8666667, b: 0.07450981, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 35 + m_fontSizeMax: 35 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 50 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 12.687866, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8892964557052083340 GameObject: m_ObjectHideFlags: 0 @@ -112298,9 +113596,9 @@ RectTransform: - {fileID: 2281335782828250375} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 133.99501, y: -34.98} m_SizeDelta: {x: 68.73, y: 69.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5826074212647485071 @@ -113937,7 +115235,7 @@ GameObject: - component: {fileID: 3613037075409576965} - component: {fileID: 5839779193317266503} m_Layer: 5 - m_Name: proficiency + m_Name: t_mainstatbefore m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -113959,7 +115257,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: -73, y: 0} + m_AnchoredPosition: {x: 114.8, y: -9.4} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3613037075409576965 @@ -113990,7 +115288,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00% >> 00% + m_text: 0% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -114000,8 +115298,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -114391,7 +115689,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -40, y: 0} - m_SizeDelta: {x: 54, y: 60} + m_SizeDelta: {x: 44, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &25471956545393872 CanvasRenderer: @@ -114421,7 +115719,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b7b9999169296404a806626d12bad78f, type: 3} + m_Sprite: {fileID: 21300000, guid: 8b5dc6308340e964ca73b20b6aacf2da, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -114757,9 +116055,9 @@ RectTransform: - {fileID: 269495131661886090} m_Father: {fileID: 365265949171303323} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 333.255, y: -34.98} m_SizeDelta: {x: 68.73, y: 69.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6032891398466555591 @@ -119711,27 +121009,27 @@ PrefabInstance: - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} propertyPath: m_AnchoredPosition.x - value: 68 + value: 159 objectReference: {fileID: 0} - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} propertyPath: m_AnchoredPosition.y - value: -134 + value: -234.8 objectReference: {fileID: 0} - target: {fileID: 2427202657838919516, guid: 14c28ebbe688ad44f942d237e0d2cf3f, type: 3} diff --git a/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs b/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs index 52f99fd68..430d9c18d 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs @@ -1,13 +1,12 @@ using TMPro; -using UnityEditor.Rendering; using UnityEngine; using UnityEngine.UI; public class EquipmentItemPopup : EquipmentPopupItemInfoBase { - public RectTransform m_rect; + public RectTransform m_childrect; public EquipItemEnchantOption m_EquipItemEnchantOption; - // 0 숙련 보너스, 1 주능력치 이름, 2 주능력치값, 3 숙련도 레벨, 4 숙련도 능력치 이름, 5 숙련도%, 6 비용 + // 0 숙련 보너스%, 1 주능력치 이름, 2 주능력치값, 3 숙련도 레벨, 4 숙련도 능력치 이름, 5 숙련도%, 6 비용 public TextMeshProUGUI[] texts; public Image[] images; // 0 인챈트 스크롤 @@ -36,7 +35,7 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase m_Card.Set(m_EquipItemData); m_Card.Set_CardType(eUICardType.UIEquip); - texts[0].text = DSUtil.Format(201, m_SD_Slot.Lv * m_ESUTD.f_LevelPerValue); + texts[0].text = $"{m_SD_Slot.Lv * m_ESUTD.f_LevelPerValue}%"; texts[1].text = texts[4].text = MyText.Get_StatName(m_ESUTD.e_OptionType); var curmain = m_ESUTD.Get_MainStatValue(m_SD_Slot.Lv); var nextmain = m_ESUTD.Get_MainStatValue(m_SD_Slot.Lv + 1); @@ -81,31 +80,7 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase } public void Set_Position(bool right) - { - // 위치 조절 (좌우) - if (right) - { - // left 값을 수정 - Vector2 offsetMin = m_rect.offsetMin; - offsetMin.x = 640; // 왼쪽 오프셋을 10으로 설정 - m_rect.offsetMin = offsetMin; - - // right 값을 수정 - Vector2 offsetMax = m_rect.offsetMax; - offsetMax.x = -15; // 오른쪽 오프셋을 -10으로 설정 (음수로 설정해야 오른쪽으로 이동) - m_rect.offsetMax = offsetMax; - } - else - { - // left 값을 수정 - Vector2 offsetMin = m_rect.offsetMin; - offsetMin.x = 15; // 왼쪽 오프셋을 10으로 설정 - m_rect.offsetMin = offsetMin; - - // right 값을 수정 - Vector2 offsetMax = m_rect.offsetMax; - offsetMax.x = -640; // 오른쪽 오프셋을 -10으로 설정 (음수로 설정해야 오른쪽으로 이동) - m_rect.offsetMax = offsetMax; - } + { // 위치 조절 (좌우) + m_childrect.anchoredPosition = right ? new Vector2(545.5f, -84.75f) : new Vector2(-545.5f, -84.75f); } } \ No newline at end of file diff --git a/Assets/Script/UI/Eqiupment/EquipmentPopupItemInfoBase.cs b/Assets/Script/UI/Eqiupment/EquipmentPopupItemInfoBase.cs index 3b9490557..3ec2d8e5c 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentPopupItemInfoBase.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentPopupItemInfoBase.cs @@ -5,7 +5,7 @@ public class EquipmentPopupItemInfoBase : BackKeyAdd { public EquipItemCard m_Card; public TextMeshProUGUI[] texts_iteminfo; // 0 top등급, 1 top이름, 2 종류 - public TextMeshProUGUI[] texts_stat; // 0 ~ 2 장비 능력 + public TextMeshProUGUI[] texts_stat, texts_statval; // 0 ~ 2 장비 능력 public Image[] images_iteminfo; // 0 top이름bg, 1 top등급bg, 2 종류 protected ItemListTableData m_ItemData; @@ -39,30 +39,25 @@ public class EquipmentPopupItemInfoBase : BackKeyAdd protected virtual void Set_ItemStat() { - var smeltinglv = ServerInfo.Ins.m_ServerData.Get_SmeltingLv(m_Data.n_EquipID); - var cursmeltingdata = table_equipsmelting.Ins.Get_Data(smeltinglv); - var nextsmeltingdata = table_equipsmelting.Ins.Get_Data(smeltinglv + 1); + Set_Stat(m_Data.e_AbilityType1, texts_stat[0], texts_statval[0], m_Data.n_AbilityValue1); + Set_Stat(m_Data.e_AbilityType2, texts_stat[1], texts_statval[1], m_Data.n_AbilityValue2); + Set_Stat(m_Data.e_AbilityType3, texts_stat[2], texts_statval[2], m_Data.n_AbilityValue3); + } - var curstat1 = m_Data.n_AbilityValue1 + m_Data.n_AbilityValue1 * cursmeltingdata.f_IncreaseValueRate; - var nextstat1 = m_Data.n_AbilityValue1 + m_Data.n_AbilityValue1 * nextsmeltingdata.f_IncreaseValueRate; - texts_stat[0].text = $"{MyText.Get_StatName(m_Data.e_AbilityType1)} {NumberFormatter.FormatNumber(curstat1)}+({NumberFormatter.FormatNumber(nextstat1 - curstat1)})"; - - if (m_Data.e_AbilityType2 != eStat.None) + void Set_Stat(eStat stat, TextMeshProUGUI t_stat, TextMeshProUGUI t_statval, int abil1) + { + if (stat != eStat.None) { - var curstat2 = m_Data.n_AbilityValue2 + m_Data.n_AbilityValue2 * cursmeltingdata.f_IncreaseValueRate; - var nextstat2 = m_Data.n_AbilityValue2 + m_Data.n_AbilityValue2 * nextsmeltingdata.f_IncreaseValueRate; - texts_stat[1].text = $"{MyText.Get_StatName(m_Data.e_AbilityType2)} {NumberFormatter.FormatNumber(curstat2)}+({NumberFormatter.FormatNumber(nextstat2 - curstat2)})"; + var smeltinglv = ServerInfo.Ins.m_ServerData.Get_SmeltingLv(m_Data.n_EquipID); + var cursmeltingdata = table_equipsmelting.Ins.Get_Data(smeltinglv); + var nextsmeltingdata = table_equipsmelting.Ins.Get_Data(smeltinglv + 1); + + var curstat = abil1 + abil1 * cursmeltingdata.f_IncreaseValueRate; + var nextstat = abil1 + abil1 * nextsmeltingdata.f_IncreaseValueRate; + t_stat.text = MyText.Get_StatName(stat); + t_statval.text = $"{NumberFormatter.FormatNumber(curstat)}(+{NumberFormatter.FormatNumber(nextstat - curstat)})"; } else - texts_stat[1].text = ""; - - if (m_Data.e_AbilityType3 != eStat.None) - { - var curstat3 = m_Data.n_AbilityValue3 + m_Data.n_AbilityValue3 * cursmeltingdata.f_IncreaseValueRate; - var nextstat3 = m_Data.n_AbilityValue3 + m_Data.n_AbilityValue3 * nextsmeltingdata.f_IncreaseValueRate; - texts_stat[2].text = $"{MyText.Get_StatName(m_Data.e_AbilityType3)} {NumberFormatter.FormatNumber(curstat3)}+({NumberFormatter.FormatNumber(nextstat3 - curstat3)})"; - } - else - texts_stat[2].text = ""; + t_statval.text = t_stat.text = ""; } } \ No newline at end of file