장비 도감

Assets/ResWork/Table/Export/EquipCrafting.json

@@ -1 +1 @@
-[{"n_CraftingItemID": "10100001", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "1", "n_MaterialValue1": "10300001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010101", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10100002", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "2", "n_MaterialValue1": "10100001", "n_MaterialCount1": "10", "n_MaterialValue2": "201", "n_MaterialCount2": "999", "n_MaterialValue3": "202", "n_MaterialCount3": "99", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10100003", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "3", "n_MaterialValue1": "10100002", "n_MaterialCount1": "15", "n_MaterialValue2": "201", "n_MaterialCount2": "8888", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10300001", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "201", "n_MaterialCount1": "10", "n_MaterialValue2": "202", "n_MaterialCount2": "20", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10002", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "10100002", "n_MaterialCount1": "3", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "1010104", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10003", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "5", "n_MaterialValue1": "10100003", "n_MaterialCount1": "3", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "101", "n_MaterialCount3": "100", "n_LinkPointID1": "1010103", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10004", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "6", "n_MaterialValue1": "0", "n_MaterialCount1": "0", "n_MaterialValue2": "0", "n_MaterialCount2": "0", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "101", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "7", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "102", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "8", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}]
+[{"n_CraftingItemID": "10101001", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "1", "n_MaterialValue1": "1", "n_MaterialCount1": "1", "n_MaterialValue2": "201", "n_MaterialCount2": "10", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010101", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10100002", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "2", "n_MaterialValue1": "10100001", "n_MaterialCount1": "10", "n_MaterialValue2": "201", "n_MaterialCount2": "999", "n_MaterialValue3": "202", "n_MaterialCount3": "99", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10100003", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "3", "n_MaterialValue1": "10100002", "n_MaterialCount1": "15", "n_MaterialValue2": "201", "n_MaterialCount2": "8888", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10300001", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "201", "n_MaterialCount1": "10", "n_MaterialValue2": "202", "n_MaterialCount2": "20", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "0", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10002", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "4", "n_MaterialValue1": "10100002", "n_MaterialCount1": "3", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "1010104", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10003", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "5", "n_MaterialValue1": "10100003", "n_MaterialCount1": "3", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "101", "n_MaterialCount3": "100", "n_LinkPointID1": "1010103", "n_LinkPointID2": "1010102", "n_LinkPointID3": "1010103", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "10004", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "6", "n_MaterialValue1": "0", "n_MaterialCount1": "0", "n_MaterialValue2": "0", "n_MaterialCount2": "0", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010102", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "101", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "7", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}, {"n_CraftingItemID": "102", "n_CraftingGoodsPrice": "333", "n_CraftingGoodsCount": "8", "n_MaterialValue1": "10200001", "n_MaterialCount1": "5", "n_MaterialValue2": "201", "n_MaterialCount2": "1000", "n_MaterialValue3": "0", "n_MaterialCount3": "0", "n_LinkPointID1": "1010103", "n_LinkPointID2": "0", "n_LinkPointID3": "0", "n_LinkPointID4": "0", "n_LinkPointID5": "0"}]

Assets/ResWork/UIPrefabs/Collection/Equipment/CollectionEquipmentCard.prefab

@@ -279,6 +279,7 @@ RectTransform:
   - {fileID: 4182965467882004140}
   - {fileID: 5841424508221992561}
   - {fileID: 1774599225772265690}
+  - {fileID: 7670993250085146987}
   - {fileID: 2923538530552401233}
   - {fileID: 8116232380095386588}
   - {fileID: 3103851576076292379}
@@ -302,12 +303,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   images:
-  - {fileID: 0}
   - {fileID: 6301755371914612518}
   texts:
   - {fileID: 7992144186032099268}
   - {fileID: 348960993680261740}
   - {fileID: 296753585639026857}
+  - {fileID: 6602245033917613361}
   slider_proc: {fileID: 1449530348186702030}
   go_getreward: {fileID: 6069031652577001856}
   go_selected: {fileID: 5109952517815358903}
@@ -832,7 +833,7 @@ GameObject:
   - component: {fileID: 4188606820804090270}
   - component: {fileID: 348960993680261740}
   m_Layer: 5
-  m_Name: t_statval
+  m_Name: t_stat
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -852,10 +853,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 754867752535590494}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -220.5}
+  m_AnchoredPosition: {x: -113.9, y: -79.5}
-  m_SizeDelta: {x: 150, y: 30}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4188606820804090270
 CanvasRenderer:
@@ -920,7 +921,7 @@ MonoBehaviour:
   m_fontSizeMin: 10
   m_fontSizeMax: 40
   m_fontStyle: 0
-  m_HorizontalAlignment: 2
+  m_HorizontalAlignment: 1
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -1191,6 +1192,141 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8798220322836897196
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7670993250085146987}
+  - component: {fileID: 6298086399108859595}
+  - component: {fileID: 6602245033917613361}
+  m_Layer: 5
+  m_Name: t_statval
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7670993250085146987
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8798220322836897196}
+  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: 754867752535590494}
+  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: 116.4, y: -79.5}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6298086399108859595
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8798220322836897196}
+  m_CullTransparentMesh: 1
+--- !u!114 &6602245033917613361
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8798220322836897196}
+  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: 000
+  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: 4288991445
+  m_fontColor: {r: 0.8352942, g: 0.81568635, b: 0.6431373, 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: 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 &9164550105374022556
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res_Addr/MainUI/NewGameUI.prefab

@@ -14466,18 +14466,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1234385664530936403}
-  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: 6753540363038379326}
   - {fileID: 8627808771262358063}
-  m_Father: {fileID: 4076884441229190674}
+  m_Father: {fileID: 6341622311136187960}
   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: -1017.59, y: -230.2}
+  m_AnchoredPosition: {x: -600, y: -213.64824}
   m_SizeDelta: {x: 342.53, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2643276124655616653
@@ -14562,7 +14562,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 2286153587421699648}
+      - m_Target: {fileID: 0}
         m_TargetAssemblyTypeName: CollectionEquipmentUI_Info, Assembly-CSharp
         m_MethodName: OnClick_GetAll
         m_Mode: 1
@@ -14852,16 +14852,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1242020055105529911}
-  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: 4076884441229190674}
+  m_Father: {fileID: 6341622311136187960}
   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: -1020, y: -313.3}
+  m_AnchoredPosition: {x: -602.2891, y: -296.74823}
   m_SizeDelta: {x: 700, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6819400641967297395
@@ -20547,18 +20547,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1749035969668327883}
-  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: 755357404366469239}
   - {fileID: 8173468066521968722}
-  m_Father: {fileID: 4076884441229190674}
+  m_Father: {fileID: 6341622311136187960}
   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: -1020.26, y: 331.44022}
+  m_AnchoredPosition: {x: -602.5492, y: 347.99197}
   m_SizeDelta: {x: 489.86, y: 73.09}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8587887418675300676
@@ -29009,7 +29009,7 @@ GameObject:
   - component: {fileID: 8432088745037302512}
   - component: {fileID: 3067275955783388083}
   m_Layer: 5
-  m_Name: New TMP
+  m_Name: t_getreward
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -29022,16 +29022,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2283011362962970430}
-  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: 4076884441229190674}
+  m_Father: {fileID: 6341622311136187960}
   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: -1031, y: -141}
+  m_AnchoredPosition: {x: -600, y: -136.1}
   m_SizeDelta: {x: 150, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8432088745037302512
@@ -29090,8 +29090,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 25
-  m_fontSizeBase: 20
+  m_fontSizeBase: 25
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 10
@@ -38886,68 +38886,6 @@ RectTransform:
   m_AnchoredPosition: {x: 57.5, y: -57}
   m_SizeDelta: {x: 115, y: 114}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &3024059279274404981
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4076884441229190674}
-  - component: {fileID: 2286153587421699648}
-  m_Layer: 5
-  m_Name: Info
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4076884441229190674
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3024059279274404981}
-  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: 1152017196051519122}
-  - {fileID: 8711325757493557917}
-  - {fileID: 6585522929147241013}
-  - {fileID: 735290443554363883}
-  - {fileID: 2916946936006667796}
-  - {fileID: 6869406879047468741}
-  m_Father: {fileID: 3792428484561972198}
-  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: 1377.7109, y: 16.551758}
-  m_SizeDelta: {x: 1084.5701, y: 888.24}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2286153587421699648
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3024059279274404981}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7ae29ceef2ff16644999b1edbe0bc056, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ScrollRect: {fileID: 0}
-  m_Content: {fileID: 7156421281443058806}
-  go_card: {fileID: 6523031841280304506, guid: 4d2a57e70e160284582f8512b2589d1e, type: 3}
-  texts:
-  - {fileID: 3067275955783388083}
-  gos:
-  - {fileID: 4388773872631195275}
-  go_noti: {fileID: 1761853729118910426}
 --- !u!1 &3031564848443561661
 GameObject:
   m_ObjectHideFlags: 0
@@ -39559,7 +39497,8 @@ RectTransform:
   m_Children:
   - {fileID: 4586572642161834134}
   - {fileID: 9075668479270564878}
-  - {fileID: 4076884441229190674}
+  - {fileID: 6341622311136187960}
+  - {fileID: 8195558841707298353}
   m_Father: {fileID: 4195766870477181012}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -39581,7 +39520,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Tab: {fileID: 3751424368690524809}
   m_CollectionEquipmentUI_Scroll: {fileID: 3280020211414951821}
-  m_CollectionEquipmentUI_Info: {fileID: 2286153587421699648}
+  m_CollectionEquipmentUI_Info: {fileID: 8251618858408308075}
 --- !u!114 &3280020211414951821
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -39670,6 +39609,141 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -20, y: -20}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &3079929924028293003
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8195558841707298353}
+  - component: {fileID: 7925652206424467843}
+  - component: {fileID: 854686968774112761}
+  m_Layer: 5
+  m_Name: t_collection
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8195558841707298353
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3079929924028293003}
+  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: 3792428484561972198}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -130.9, y: -148.7}
+  m_SizeDelta: {x: 150, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7925652206424467843
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3079929924028293003}
+  m_CullTransparentMesh: 1
+--- !u!114 &854686968774112761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3079929924028293003}
+  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: "\uC218\uC9D1\uB960\n<size=30><color=#C4C086>000/000"
+  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: 4287021252
+  m_fontColor: {r: 0.7686275, g: 0.75294125, b: 0.5254902, 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: 2
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 17.64
+  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 &3083740965406761319
 GameObject:
   m_ObjectHideFlags: 0
@@ -44477,7 +44551,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 3024059279274404981}
+      - m_Target: {fileID: 0}
         m_TargetAssemblyTypeName: 
         m_MethodName: 
         m_Mode: 1
@@ -55517,17 +55591,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4388773872631195275}
-  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: 1424113407995695312}
-  m_Father: {fileID: 4076884441229190674}
+  m_Father: {fileID: 6341622311136187960}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 85}
+  m_AnchoredPosition: {x: -610, y: -333}
   m_SizeDelta: {x: 150, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1793229273913143279
@@ -55612,7 +55686,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 2286153587421699648}
+      - m_Target: {fileID: 0}
         m_TargetAssemblyTypeName: CollectionEquipmentUI_Info, Assembly-CSharp
         m_MethodName: OnClick_Make
         m_Mode: 1
@@ -86166,16 +86240,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7156421281443058806}
-  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: 4076884441229190674}
+  m_Father: {fileID: 6341622311136187960}
   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: -1019.78064, y: -3.899994}
+  m_AnchoredPosition: {x: -602.06976, y: 12.651764}
   m_SizeDelta: {x: 516.36, y: 477.32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6058056990156874348
@@ -100039,6 +100113,69 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8268706391003726737
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6341622311136187960}
+  - component: {fileID: 8251618858408308075}
+  m_Layer: 5
+  m_Name: Info
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6341622311136187960
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8268706391003726737}
+  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: 1152017196051519122}
+  - {fileID: 8711325757493557917}
+  - {fileID: 6585522929147241013}
+  - {fileID: 735290443554363883}
+  - {fileID: 2916946936006667796}
+  - {fileID: 6869406879047468741}
+  m_Father: {fileID: 3792428484561972198}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8251618858408308075
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8268706391003726737}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7ae29ceef2ff16644999b1edbe0bc056, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ScrollRect: {fileID: 0}
+  m_Content: {fileID: 7156421281443058806}
+  go_card: {fileID: 6523031841280304506, guid: 4d2a57e70e160284582f8512b2589d1e, type: 3}
+  texts:
+  - {fileID: 3067275955783388083}
+  - {fileID: 854686968774112761}
+  gos:
+  - {fileID: 4388773872631195275}
+  go_noti: {fileID: 1761853729118910426}
 --- !u!1 &8277840834063213086
 GameObject:
   m_ObjectHideFlags: 0

Assets/Script/UI/Collection/Equipment/CollectionEquipmentCard.cs

@@ -4,8 +4,8 @@ using UnityEngine.UI;
 
 public class CollectionEquipmentCard : CardBase
 {
-    public Image[] images; // 0 등급, 1 아이콘
+    public Image[] images; // 0 아이콘
-    public TextMeshProUGUI[] texts; // 0 이름, 1 보유효과, 2 보유/필요
+    public TextMeshProUGUI[] texts; // 0 이름, 1 보유효과, 2 보유/필요. 3 보유효과 값
     public Slider slider_proc;
     public GameObject go_getreward, go_selected;
 
@@ -19,11 +19,12 @@ public class CollectionEquipmentCard : CardBase
         var itemData = table_itemlist.Ins.Get_Data(m_Data.n_TargetValue);
         if (DSUtil.CheckNull(itemData)) return;
 
-        images[0].sprite = UIAtlasMgr.Ins.Get_GradeSprite(itemData.n_ItemGrade);
+        //images[0].sprite = UIAtlasMgr.Ins.Get_GradeSprite(itemData.n_ItemGrade);
-        images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(itemData.n_ItemID);
+        images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(itemData.n_ItemID);
 
         texts[0].text = table_itemlist.Ins.Get_ItemName(itemData.n_ItemID);
-        texts[1].text = m_Data.n_RepeatRewardValue;
+        texts[1].text = MyText.Get_eAwakenUpgradeOptionTypeName(m_Data.n_RepeatRewardValue);
+        texts[3].text = m_Data.n_RepeatRewardCount.ToString();
         var amount = sdata.Get_ItemAmount(m_Data.n_TargetValue);
         var lv = sdata.Get_CollectionLv(m_Data.n_TargetValue);
         var count = m_Data.Get_ConditionCount(lv);

Assets/Script/UI/Collection/Equipment/CollectionEquipmentUI_Info.cs

@@ -1,12 +1,10 @@
-using System.Collections;
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
-using UnityEngine.Assertions.Must;
 
 public class CollectionEquipmentUI_Info : uScrollViewMgr
 {
-    public TextMeshProUGUI[] texts; // 0 다음 보상
+    public TextMeshProUGUI[] texts; // 0 다음 보상, 1 수집률
     public GameObject[] gos; // 0 제작 버튼
     public GameObject go_noti;
 
@@ -40,13 +38,22 @@ public class CollectionEquipmentUI_Info : uScrollViewMgr
                 list_CardBase[i].Set(Mathf.Max(lv - 1, 0) * data.n_RepeatRewardCount);
         }
 
-        if (lv > 0)
+        texts[0].text = lv > 0 ?
-            texts[0].text = $"레벨 업 시 획득 보상\n{data.n_RepeatRewardValue} : {data.n_RepeatRewardCount}";
+            DSUtil.Format(358, MyText.Get_eAwakenUpgradeOptionTypeName(data.n_RepeatRewardValue), data.n_RepeatRewardCount) :
-        else
+            DSUtil.Format(359, MyText.Get_eAwakenUpgradeOptionTypeName(data.n_FirstRewardValue.ToString()), data.n_FirstRewardCount);
-            texts[0].text = $"최초 획득 보상\n{data.n_FirstRewardValue} : {data.n_FirstRewardCount}";
 
-        gos[0].SetActive(!DSUtil.CheckNull(m_MakeData) && m_MakeData.e_EquipParts == eItem.Weapon);
+        //gos[0].SetActive(!DSUtil.CheckNull(m_MakeData) && m_MakeData.e_EquipParts == eItem.Weapon);
         go_noti.SetActive(sdata.Noti_CollectionEquipment(data.e_TargetCondition, data.e_MenuCategory));
+
+        var lst = table_collectionlist.Ins.Get_DataList(data.e_TargetCondition, data.e_MenuCategory);
+        var count = lst.Count;
+        var obtaincount = 0;
+        for (int i = 0; i < lst.Count; i++)
+        {
+            if (sdata.IsObtainItem(lst[i].n_TargetValue))
+                ++obtaincount;
+        }
+        texts[1].text = DSUtil.Format(360, obtaincount, count);
     }
 
     public void OnClick_Make()

Assets/Script/UI/Collection/Equipment/CollectionStatUpCard.cs

@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
-using UnityEngine;
 
 public class CollectionStatUpCard : CardBase
 {
@@ -12,14 +9,7 @@ public class CollectionStatUpCard : CardBase
     public override void Set<T>(T _base)
     {
         base.Set(_base);
-        var e = DSUtil.StringToEnum<eAwakenUpgradeOptionType>(_base.ToString());
+        texts[0].text = MyText.Get_eAwakenUpgradeOptionTypeName(_base.ToString());
-        switch (e)
-        {
-            case eAwakenUpgradeOptionType.STR_ADD: texts[0].text = table_localtext.Ins.Get_Text(701013); break;
-            case eAwakenUpgradeOptionType.DEX_ADD: texts[0].text = table_localtext.Ins.Get_Text(701014); break;
-            case eAwakenUpgradeOptionType.INT_ADD: texts[0].text = table_localtext.Ins.Get_Text(701015); break;
-            case eAwakenUpgradeOptionType.LUK_ADD: texts[0].text = table_localtext.Ins.Get_Text(701016); break;
-        }
         m_StatVal = 0;
         texts[1].text = "0";
     }

Assets/Script/UI/Collection/Monster/CollectionMonsterCard.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;

Assets/Script/Util/MyText.cs

@@ -61,6 +61,17 @@ public static class MyText
             case 7: return DSUtil.Format("{0}등급7", color);
         }
     }
+    public static string Get_eAwakenUpgradeOptionTypeName(string type)
+    {
+        switch (type)
+        {
+            case "STR_ADD": return table_localtext.Ins.Get_Text(40002);
+            case "DEX_ADD": return table_localtext.Ins.Get_Text(40004);
+            case "INT_ADD": return table_localtext.Ins.Get_Text(40006);
+            case "LUK_ADD": return table_localtext.Ins.Get_Text(40008);
+        }
+        return table_localtext.Ins.Get_Text(361);
+    }
     public static string Get_ItemDesc(eItem _item, int _id = 0)
     {
         switch (_item)