diff --git a/Assets/ResWork/Table/Export/Localization.json b/Assets/ResWork/Table/Export/Localization.json index 0f8ef9d9c..42d452af7 100644 --- a/Assets/ResWork/Table/Export/Localization.json +++ b/Assets/ResWork/Table/Export/Localization.json @@ -48,7 +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": "숙련 보너스", "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": "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 1c83c5965..c1b06586e 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 913ab38bd..bd5a98fe8 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -8533,7 +8533,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 12.687866, y: 0, z: 0, w: 0} + m_margin: {x: 44, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -15168,10 +15168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8350210740728325229} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.3, y: 0} - m_SizeDelta: {x: -15, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -162.3, y: 0} + m_SizeDelta: {x: 285, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7438181813885832800 CanvasRenderer: @@ -15232,9 +15232,9 @@ MonoBehaviour: m_fontSize: 25 m_fontSizeBase: 25 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 + m_enableAutoSizing: 1 + m_fontSizeMin: 25 + m_fontSizeMax: 25 m_fontStyle: 0 m_HorizontalAlignment: 4 m_VerticalAlignment: 4096 @@ -15244,8 +15244,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} @@ -15265,7 +15265,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 215.61983, y: 0, z: -7.435196, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -17494,7 +17494,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} m_Name: m_EditorClassIdentifier: - m_localtextKey: 0 + m_localtextKey: 201 --- !u!1 &1499860625279893636 GameObject: m_ObjectHideFlags: 0 @@ -20947,7 +20947,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 12.687866, y: 0, z: 0, w: 0} + m_margin: {x: 44, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -21319,6 +21319,7 @@ MonoBehaviour: - {fileID: 4589797737899049074} - {fileID: 5839779193317266503} - {fileID: 387100154458185404} + - {fileID: 6693831424728331374} images: - {fileID: 5773786231538357732} --- !u!1 &1778465763048506142 @@ -59811,7 +59812,7 @@ RectTransform: 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_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1922659767223915412 CanvasRenderer: @@ -59841,7 +59842,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0% + m_text: 000% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -59872,9 +59873,9 @@ MonoBehaviour: m_fontSize: 25 m_fontSizeBase: 25 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 + m_enableAutoSizing: 1 + m_fontSizeMin: 25 + m_fontSizeMax: 25 m_fontStyle: 0 m_HorizontalAlignment: 4 m_VerticalAlignment: 4096 @@ -59884,8 +59885,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} @@ -59905,7 +59906,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 7.482151, y: 0, z: 32.562546, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -64414,7 +64415,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 12.687866, y: 0, z: 0, w: 0} + m_margin: {x: 44, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -71841,8 +71842,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 119.00995, y: 92.62} - m_SizeDelta: {x: 208.12, y: 46.76} + m_AnchoredPosition: {x: 133.5, y: 92.62} + m_SizeDelta: {x: 250, y: 46.76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1252649723237674931 CanvasRenderer: @@ -76178,9 +76179,9 @@ MonoBehaviour: m_fontSize: 25 m_fontSizeBase: 25 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 + m_enableAutoSizing: 1 + m_fontSizeMin: 25 + m_fontSizeMax: 25 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 @@ -76190,8 +76191,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} @@ -76211,7 +76212,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -18.608437, y: 0, z: -76.637054, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -80477,10 +80478,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8350210740728325229} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 14, y: 0} - m_SizeDelta: {x: -15.000125, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 164, y: 0} + m_SizeDelta: {x: 284.99988, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5745878110379333504 CanvasRenderer: @@ -80541,9 +80542,9 @@ MonoBehaviour: m_fontSize: 30 m_fontSizeBase: 30 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 + m_enableAutoSizing: 1 + m_fontSizeMin: 30 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 @@ -80553,8 +80554,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} @@ -80574,7 +80575,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -11.89624, y: 0, z: 171.75238, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -104971,7 +104972,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: 178.3, y: -8.8} + m_AnchoredPosition: {x: 186.3, y: -8.8} m_SizeDelta: {x: 19, y: 23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2531850055278141479 @@ -115288,7 +115289,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0% + m_text: 000% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, @@ -115319,9 +115320,9 @@ MonoBehaviour: m_fontSize: 25 m_fontSizeBase: 25 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 + m_enableAutoSizing: 1 + m_fontSizeMin: 25 + m_fontSizeMax: 25 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 4096 @@ -115331,7 +115332,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 @@ -115352,7 +115353,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: -53.781696, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs b/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs index 430d9c18d..781e0b03b 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs @@ -6,7 +6,7 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase { public RectTransform m_childrect; public EquipItemEnchantOption m_EquipItemEnchantOption; - // 0 숙련 보너스%, 1 주능력치 이름, 2 주능력치값, 3 숙련도 레벨, 4 숙련도 능력치 이름, 5 숙련도%, 6 비용 + // 0 숙련 보너스%, 1 주능력치 이름, 2 주능력치값, 3 숙련도 레벨, 4 숙련도 능력치 이름, 5 숙련도 전, 6 비용, 7 숙련도 후 public TextMeshProUGUI[] texts; public Image[] images; // 0 인챈트 스크롤 @@ -43,7 +43,8 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase var nextmainText = MyText.Get_StatValueText(m_ESUTD.e_OptionType, nextmain - curmain); texts[2].text = $"{curmainText}+{nextmainText}"; texts[3].text = $"Lv.{m_SD_Slot.Lv}"; - texts[5].text = $"{curmainText} >> {MyText.Get_StatValueText(m_ESUTD.e_OptionType, curmain + nextmain - curmain)}"; + texts[5].text = $"{curmainText}%"; + texts[7].text = $"{MyText.Get_StatValueText(m_ESUTD.e_OptionType, curmain + nextmain - curmain)}%"; texts[6].text = NumberFormatter.FormatNumber(Get_Price()); m_EquipItemEnchantOption.Set(m_SD_Slot);