Merge branch 'feature/mythic-to-filter' into feature/mythic-so-color

eugene-doobu · eugene-doobu · commit e7ec4417f78b · 2025-04-03T22:38:53.000+09:00
diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_CollectionItemFilterPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_CollectionItemFilterPopup.prefab
@@ -957,6 +957,8 @@ MonoBehaviour:
     grade: 16
   - toggle: {fileID: 823809620263955995}
     grade: 32
+  - toggle: {fileID: 8697642880869149624}
+    grade: 64
   elementalToggles:
   - toggle: {fileID: 8843454125762098920}
     elemental: 0
@@ -2205,6 +2207,7 @@ RectTransform:
   - {fileID: 6976945109468890740}
   - {fileID: 1000562647467813150}
   - {fileID: 7009733365596832632}
+  - {fileID: 1341348356706961115}
   m_Father: {fileID: 1897012904312159298}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6480,22 +6483,22 @@ PrefabInstance:
     - target: {fileID: 4176030817504258692, guid: a2f639b857bff3b4c8c136b903c361ca,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4176030817504258692, guid: a2f639b857bff3b4c8c136b903c361ca,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4176030817504258692, guid: a2f639b857bff3b4c8c136b903c361ca,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 4176030817504258692, guid: a2f639b857bff3b4c8c136b903c361ca,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -17
       objectReference: {fileID: 0}
     - target: {fileID: 4830302414719357776, guid: a2f639b857bff3b4c8c136b903c361ca,
         type: 3}
@@ -11308,6 +11311,303 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 090a3247e50b4ac2929c086464b5cfbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &5100603037749593224
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3710559067987940557}
+    m_Modifications:
+    - target: {fileID: 229811045429093937, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 229811045429093937, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 229811045429093937, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 229811045429093937, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 444167209925245795, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_Name
+      value: FilterButtonCell (7)
+      objectReference: {fileID: 0}
+    - target: {fileID: 444167209925245795, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1762587820189282737, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_text
+      value: Mythic
+      objectReference: {fileID: 0}
+    - target: {fileID: 1762587820189282737, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1762587820189282737, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_fontColor.b
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 1762587820189282737, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_fontColor.g
+      value: 0.65882355
+      objectReference: {fileID: 0}
+    - target: {fileID: 1762587820189282737, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_fontColor.r
+      value: 0.22352941
+      objectReference: {fileID: 0}
+    - target: {fileID: 1762587820189282737, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_fontColor32.rgba
+      value: 4289374265
+      objectReference: {fileID: 0}
+    - target: {fileID: 3984121650481663168, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3984121650481663168, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3984121650481663168, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3984121650481663168, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4176030817504258692, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4176030817504258692, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4176030817504258692, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4176030817504258692, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4830302414719357776, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4830302414719357776, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4830302414719357776, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4830302414719357776, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 44
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7263780861660028050, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7263780861660028050, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7263780861660028050, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7263780861660028050, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7753921435366336868, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7753921435366336868, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7753921435366336868, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7753921435366336868, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8502097521545359596, guid: a2f639b857bff3b4c8c136b903c361ca,
+        type: 3}
+      propertyPath: l10nKey
+      value: UI_ITEM_GRADE_7
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a2f639b857bff3b4c8c136b903c361ca, type: 3}
+--- !u!224 &1341348356706961115 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6076928512697385555, guid: a2f639b857bff3b4c8c136b903c361ca,
+    type: 3}
+  m_PrefabInstance: {fileID: 5100603037749593224}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8697642880869149624 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4502693004674264880, guid: a2f639b857bff3b4c8c136b903c361ca,
+    type: 3}
+  m_PrefabInstance: {fileID: 5100603037749593224}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 090a3247e50b4ac2929c086464b5cfbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &5161054338632560786
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/nekoyume/Assets/StreamingAssets/Localization/common.csv b/nekoyume/Assets/StreamingAssets/Localization/common.csv
@@ -772,6 +772,7 @@ UI_ITEM_GRADE_3,Epic,에픽,Épico,エピック,Épico,มหากาพย์,
 UI_ITEM_GRADE_4,Unique,유니크,Único,ユニーク,Único,เป็นเอกลักษณ์,Unik,Уникальный,独特,獨特的,Kakaiba,Độc nhất
 UI_ITEM_GRADE_5,Legend,레전드,Lenda,レジェンド,Legendario,ตำนาน,Legenda,легенда,传奇,傳奇,Maalamat,Huyền thoại
 UI_ITEM_GRADE_6,Sacred,신성,Sagrado,神聖,Sagrado,ศักดิ์สิทธิ์,Suci,Священный,神圣,神聖,Sagrado,Thần Thánh
+UI_ITEM_GRADE_7,Mythic,신화,Mitológico,神話,Mitológico,神话,Mitologi,Мифический,神话,神話,Mito,Manghihimala
 UI_OPTION,Additional options,추가 옵션,Opções adicionais,追加オプション,Opciones Adicionales,ตัวเลือกเพิ่มเติม,Opsi tambahan,Дополнительные опции,附加选项,其他選項,Karagdagang Opsyon,Tùy chọn bổ sung
 ITEM_GROUPNAME_100000,Canned Tuna,참치캔,Atum enlatado,ツナ缶,Lata de atún,ทูน่ากระป๋อง,Tuna kaleng,Консервированный тунец,金枪鱼罐头,金槍魚罐頭,Delatang tuna,Cá ngừ đóng hộp
 ITEM_GROUPNAME_100002,Fried Egg,계란 후라이,Ovo frito,目玉焼き,Huevo Frito,ไข่ดาว,Telur goreng,Жаренное яйцо,煎鸡蛋,煎雞蛋,Pritong itlog,Trứng chiên
