diff --git a/Assets/0_Scenes/Title.unity b/Assets/0_Scenes/Title.unity index 7f6a33c..1a42c03 100644 --- a/Assets/0_Scenes/Title.unity +++ b/Assets/0_Scenes/Title.unity @@ -2940,7 +2940,7 @@ MonoBehaviour: isOnSprite: - {fileID: 21300000, guid: 50a793ca026e5f94db805e7d6ef95009, type: 3} - {fileID: 21300000, guid: 56b1f3526ae1a484992f61111d77da10, type: 3} - item: {fileID: 2741497308708282211, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + item: {fileID: 3565683730023604969, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} results: {fileID: 560148188} listTop: {fileID: 1076792096} bar: {fileID: 281812711} @@ -4349,7 +4349,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1262477022} m_Father: {fileID: 1124752560} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -10467,6 +10468,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1241859490} m_CullTransparentMesh: 1 +--- !u!1001 &1262477021 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 560148188} + m_Modifications: + - target: {fileID: 2741497308708282211, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_Name + value: Item + objectReference: {fileID: 0} + - target: {fileID: 2741497308708282211, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_SizeDelta.y + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} +--- !u!224 &1262477022 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6212042657398888647, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + m_PrefabInstance: {fileID: 1262477021} + m_PrefabAsset: {fileID: 0} --- !u!1 &1266200993 GameObject: m_ObjectHideFlags: 0 @@ -12681,7 +12788,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageMask: {fileID: 622279705} - suitImage: {fileID: 1819120532} + suitImage: {fileID: 1819120534} suitName: {fileID: 260907443} ownerName: {fileID: 1577835383} suitMaker: {fileID: 252597707} @@ -14480,7 +14587,7 @@ GameObject: m_Component: - component: {fileID: 1819120531} - component: {fileID: 1819120533} - - component: {fileID: 1819120532} + - component: {fileID: 1819120534} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -14507,7 +14614,15 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 528, y: 680} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1819120532 +--- !u!222 &1819120533 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1819120530} + m_CullTransparentMesh: 1 +--- !u!114 &1819120534 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14516,7 +14631,7 @@ MonoBehaviour: m_GameObject: {fileID: 1819120530} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -14527,24 +14642,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - 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!222 &1819120533 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1819120530} - m_CullTransparentMesh: 1 + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &1820319830 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/1_Script/SearchCtrl.cs b/Assets/1_Script/SearchCtrl.cs index f731032..7691bb4 100644 --- a/Assets/1_Script/SearchCtrl.cs +++ b/Assets/1_Script/SearchCtrl.cs @@ -84,7 +84,6 @@ public class SearchCtrl : SingletonMonoBehaviour private void ObjectClear() { - //TODO 재활용 할 수 있게 만들기 results.gameObject.SetActive(false); listTop.SetActive(false); bar.SetActive(false); @@ -242,11 +241,10 @@ public class SearchCtrl : SingletonMonoBehaviour public void NextSearch() { - //검색결과를 받으오는 중에 추가 검색이 되지 않도록 막는 bool입니다. - hasMore = false; - request.page++; if (isSearching == false) { + hasMore = false; + request.page++; SearchSuiters().Forget(); } } diff --git a/Assets/1_Script/TopMenuCtrl.cs b/Assets/1_Script/TopMenuCtrl.cs index dd86693..f28d7c7 100644 --- a/Assets/1_Script/TopMenuCtrl.cs +++ b/Assets/1_Script/TopMenuCtrl.cs @@ -16,9 +16,6 @@ public class TopMenuCtrl : MonoBehaviour float time; float speed = 10; - //50 - //-100 - private void Awake() { rectTransform = GetComponent(); @@ -28,11 +25,8 @@ public class TopMenuCtrl : MonoBehaviour if(isUp) { time += Time.deltaTime * speed; - Debug.Log(time); if(time < 1.0f) - { - content.anchoredPosition = new Vector2 (0, pointY - (pointY * time)); - } + content.anchoredPosition = new Vector2(0, pointY - (pointY * time)); else { content.anchoredPosition = new Vector2(0, 0);