검색결과 작업 완료

Assets/1_Script/ItemPrefab.cs

@@ -30,7 +30,7 @@ public class ItemPrefab : MonoBehaviour
         RectTransform rect = suitImage.gameObject.GetComponent<RectTransform>();
         rect.anchorMin = new Vector2(0.5f, 0.5f);
         rect.anchorMax = new Vector2(0.5f, 0.5f);
-        float size = rect.sizeDelta.y / 600;
+        float size = rect.sizeDelta.y / 500;
         Vector2 newSize = new Vector2(rect.sizeDelta.x / size, rect.sizeDelta.y /size);
         rect.sizeDelta = newSize;
 

Assets/1_Script/ModalCtrl.cs

@@ -22,7 +22,7 @@ public class ModalCtrl : MonoBehaviour
         RectTransform rect = suitImage.gameObject.GetComponent<RectTransform>();
         rect.anchorMin = new Vector2(0.5f, 0.5f);
         rect.anchorMax = new Vector2(0.5f, 0.5f);
-        float size = rect.sizeDelta.y / 680;
+        float size = rect.sizeDelta.y / 850;
         Vector2 newSize = new Vector2(rect.sizeDelta.x / size, rect.sizeDelta.y / size);
         rect.sizeDelta = newSize;
         suitName.text = library.suit_name;

Assets/1_Script/SearchCtrl.cs

@@ -1,6 +1,3 @@
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections;
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
@@ -9,6 +6,9 @@ using UnityEngine.UI;
 public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
 {
     [SerializeField] GameObject opsion;
+    [SerializeField] Image searchMenuButtonImage;
+    [SerializeField] Sprite[] searchMenuButton;
+    [SerializeField] TMP_Text searchMenuButtonText;
 
     [SerializeField] TMP_InputField name;
     [SerializeField] TMP_Dropdown suitStyle;
@@ -20,6 +20,8 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
 
     [SerializeField] GameObject item;
     [SerializeField] Transform results;
+    [SerializeField] GameObject listTop;
+    [SerializeField] GameObject bar;
     [SerializeField] RectTransform content;
 
     [SerializeField] Animator searchUI;
@@ -50,6 +52,9 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
     private void ObjectClear()
     {
         //TODO 재활용 할 수 있게 만들기
+        results.gameObject.SetActive(false);
+        listTop.SetActive(false);
+        bar.SetActive(false);
         if (itemPrefabs.Count != 0)
         {
             for (int n = 0; n < itemPrefabs.Count; n++)
@@ -66,6 +71,9 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
         //옵션창이 나오지 않았을때 250,100
         //옵션창이 나왔을때 60 ,290
         bool isSelf = !opsion.activeSelf;
+        searchMenuButtonImage.sprite = searchMenuButton[(isSelf ? 1 : 0)];
+        searchMenuButtonImage.pixelsPerUnitMultiplier = (isSelf ? 3.5f : 1.75f);
+        searchMenuButtonText.color = (isSelf ? Color.white : Color.black);
         searchUI.SetBool("isSelf", isSelf);
         ResetButton();
     }
@@ -87,6 +95,8 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
         {
             librarys = data.data;
             results.gameObject.SetActive(true);
+            listTop.SetActive(true);
+            bar.SetActive(true);
             ItemPrefab[] items = new ItemPrefab[5];
             for (int n = 0; n < 5; n++)
             {
@@ -110,8 +120,9 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
         NetworkManager.Instance.CreateRequest<SearchResponse>("library/select/suiters", request, (data) =>
         {
             librarys.AddRange(data.data);
-            ItemPrefab[] items = new ItemPrefab[5];
+            Debug.Log(data.data.Count);
-            for (int n = 0; n < 5; n++)
+            ItemPrefab[] items = new ItemPrefab[data.data.Count];
+            for (int n = 0; n < items.Length; n++)
             {
                 GameObject prefab = Instantiate(item, results);
                 itemPrefabs.Add(prefab);

Assets/1_Script/Test.cs

@@ -1,39 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-
-public class Test : MonoBehaviour
-{
-    //public TMP_Text text;
-    public Canvas canvas;
-    private float time = 0;
-    //ApiResponse apiResponse;
-
-    //private void Start()
-    //{
-    //    NetworkManager.Instance.CreateRequest<ApiResponse>("api/test",new object(),(data) => {
-    //        apiResponse = data;
-    //    });
-    //}
-    //private void Start()
-    //{
-    //    WebGLInput.captureAllKeyboardInput = false;
-    //}
-    //void Update()
-    //{
-    //    time += Time.deltaTime;
-    //    if(time > 2.0f)
-    //    {
-    //        time = 0;
-    //        Debug.Log($"x : {canvas.transform.position.x}, y : {canvas.transform.position.y}");
-    //    }
-    //    //text.text = $"x : {canvas.transform.position.x}, y : {canvas.transform.position.y}\nip : {(apiResponse == null ? "null": apiResponse.test)}";
-    
-    //}
-    //public class ApiResponse
-    //{
-    //    public string test;
-    //}
-
-}

Assets/1_Script/TopMenuCtrl.cs

@@ -0,0 +1,58 @@
+using TMPro;
+using UnityEngine;
+
+public class TopMenuCtrl : MonoBehaviour
+{
+    [SerializeField] RectTransform content;
+    [SerializeField] RectTransform topButton;
+    RectTransform rectTransform;
+
+    [SerializeField] TMP_Text search;
+    [SerializeField] TMP_Text fursuit;
+
+    bool isUp = false;
+
+    float pointY;
+    float time;
+    float speed = 10;
+
+    //50
+    //-100
+
+    private void Awake()
+    {
+        rectTransform = GetComponent<RectTransform>();
+    }
+    private void Update()
+    {
+        if(isUp)
+        {
+            time += Time.deltaTime * speed;
+            Debug.Log(time);
+            if(time < 1.0f)
+            {
+                content.anchoredPosition = new Vector2 (0, pointY - (pointY * time));
+            }
+            else
+            {
+                content.anchoredPosition = new Vector2(0, 0);
+                isUp = false;
+            }
+        }
+        else
+        {
+            float sizeY = (content.anchoredPosition.y / (((float)Screen.height) / 100) / 100);
+            search.text = sizeY < 0.5f ? "행\n사\n\n검\n색" : "행\n사";
+            fursuit.text = sizeY < 0.5f ? "퍼\n슈\n트\n\n등\n록" : "퍼\n슈\n트";
+            sizeY = (sizeY < 1.0f ? sizeY : 1.0f);
+            rectTransform.sizeDelta = new Vector2(282.5f, 242 - (sizeY * 87));
+            topButton.anchoredPosition = new Vector2(-50, -100f + (sizeY * 150f));
+        }
+    }
+    public void TopButton()
+    {
+        isUp = true;
+        pointY = content.anchoredPosition.y;
+        time = 0;
+    }
+}

Assets/3_Prefab/Item.prefab

@@ -1,5 +1,80 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2571536515372684647
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6213423518440723368}
+  - component: {fileID: 5418418412857075194}
+  - component: {fileID: 2625244873140159419}
+  m_Layer: 5
+  m_Name: Rectangle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6213423518440723368
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2571536515372684647}
+  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: 716527630986831245}
+  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: 0}
+  m_SizeDelta: {x: 0, y: 100}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &5418418412857075194
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2571536515372684647}
+  m_CullTransparentMesh: 1
+--- !u!114 &2625244873140159419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2571536515372684647}
+  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.2, g: 0.2, b: 0.2, 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: 07b8bda1ce5102f489c4b08076728ce7, 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 &2741497308708282211
 GameObject:
   m_ObjectHideFlags: 0
@@ -12,6 +87,7 @@ GameObject:
   - component: {fileID: 3755980766472622143}
   - component: {fileID: 3565683730023604969}
   - component: {fileID: 748755465289565643}
+  - component: {fileID: 117988139100295041}
   m_Layer: 5
   m_Name: Item
   m_TagString: Untagged
@@ -39,7 +115,7 @@ RectTransform:
   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_SizeDelta: {x: 300, y: 500}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3755980766472622143
 CanvasRenderer:
@@ -104,7 +180,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 117988139100295041}
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
@@ -120,6 +196,36 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &117988139100295041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2741497308708282211}
+  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: 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: c268c8f42164eb047bf96dd762f73284, 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 &3874408075247954670
 GameObject:
   m_ObjectHideFlags: 0
@@ -229,7 +335,7 @@ RectTransform:
   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: 75}
+  m_AnchoredPosition: {x: 0, y: 43}
   m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8438432587804847667
@@ -260,7 +366,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 
+  m_text: "\uD37C\uC288\uD2B8 \uC774\uB984"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: fa815c52c40f46f41b79c566401b9ecd, type: 2}
   m_sharedMaterial: {fileID: -5258181723622866090, guid: fa815c52c40f46f41b79c566401b9ecd, type: 2}
@@ -363,7 +469,7 @@ RectTransform:
   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: 25}
+  m_AnchoredPosition: {x: 0, y: 5}
   m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1160135086518038069
@@ -394,7 +500,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 
+  m_text: "\uC624\uB108\uC774\uB984"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: fa815c52c40f46f41b79c566401b9ecd, type: 2}
   m_sharedMaterial: {fileID: -5258181723622866090, guid: fa815c52c40f46f41b79c566401b9ecd, type: 2}
@@ -421,8 +527,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 25
+  m_fontSize: 20
-  m_fontSizeBase: 25
+  m_fontSizeBase: 20
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -495,6 +601,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 104449160465615579}
+  - {fileID: 6213423518440723368}
   m_Father: {fileID: 6212042657398888647}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -539,7 +646,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 2.5
+  m_PixelsPerUnitMultiplier: 4.5
 --- !u!114 &4532091925091001432
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/4_Font/NotoSans/NotoSansKR-SemiBold SDF.asset

@@ -73,9 +73,9 @@ Material:
     - _OutlineWidth: 0
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 1
+    - _ScaleRatioA: 0.9
-    - _ScaleRatioB: 1
+    - _ScaleRatioB: 0.73125
-    - _ScaleRatioC: 1
+    - _ScaleRatioC: 0.73125
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0
@@ -120,9 +120,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
   m_Name: NotoSansKR-SemiBold SDF
   m_EditorClassIdentifier: 
-  hashCode: 0
+  hashCode: -910902713
   material: {fileID: -7559958313236265572}
-  materialHashCode: 0
+  materialHashCode: 174381063
   m_Version: 1.1.0
   m_SourceFontFileGUID: 4e051b29f78cfe04a89daa035e062dbf
   m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 4e051b29f78cfe04a89daa035e062dbf, type: 3}

Assets/5_Anim/UI/SearchUI.controller

@@ -8,7 +8,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SearchUIOn
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 8712130208697404147}
@@ -105,9 +105,9 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 1
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
-  m_ExitTime: 0.0000000017193648
+  m_ExitTime: 0.0000000030077507
   m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
@@ -121,7 +121,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SearchUIOff
-  m_Speed: -1
+  m_Speed: -2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 6587228311752911440}
@@ -158,7 +158,7 @@ AnimatorStateMachine:
     m_Position: {x: 200, y: 210, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1429651914262540080}
-    m_Position: {x: 470, y: 340, z: 0}
+    m_Position: {x: 480, y: 340, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -186,9 +186,9 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 1
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
-  m_ExitTime: 0.0000000017193648
+  m_ExitTime: 0.00000000315289
   m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
@@ -236,9 +236,9 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 1
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
-  m_ExitTime: 0
+  m_ExitTime: 0.00000001272416
   m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0

Assets/5_Anim/UI/SearchUIMove.anim

@@ -31,7 +31,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1
+        time: 0.16666667
         value: 115
         inSlope: 0
         outSlope: 0
@@ -61,7 +61,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1
+        time: 0.16666667
         value: -350
         inSlope: 0
         outSlope: 0
@@ -91,7 +91,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0
@@ -187,7 +187,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.16666667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -217,7 +217,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1
+        time: 0.16666667
         value: 115
         inSlope: 0
         outSlope: 0
@@ -247,7 +247,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1
+        time: 0.16666667
         value: -350
         inSlope: 0
         outSlope: 0
@@ -277,7 +277,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 1
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0