ui onoff 정리

Assets/Memo.txt

@@ -27,6 +27,7 @@
 
 
 
+메인 화면 - 일부 이미지 변경
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 아래는 게등위 버전 이후 작업 예정 목록입니다.
 멍박 구현 필요 (동물 7마리 이상, 상대는 동물 없을 때 2배)

Assets/Scenes/Main.unity

@@ -13833,7 +13833,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
-  m_RaycastPadding: {x: -50, y: -50, z: -50, w: -30}
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -14540,12 +14540,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 367858325375b774eb678790bc4991a3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  go_GamePanel: {fileID: 771770699}
   go_AlbumPanel: {fileID: 1535761048}
   go_MainPanel: {fileID: 1166114707}
   go_ShopPanel: {fileID: 833499340}
   go_TopPanel: {fileID: 302272076}
   go_BottomPanel: {fileID: 559934551}
+  go_Top_Moneys: {fileID: 1907678486}
+  go_Top_x: {fileID: 645434587}
   go_Bottom_LB: {fileID: 2137650019}
   go_Bottom_RB: {fileID: 1058167915}
 --- !u!1 &302272076
@@ -14577,9 +14578,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 381389661}
+  - {fileID: 1907678487}
-  - {fileID: 1722250695}
-  - {fileID: 1285024409}
   - {fileID: 175985509}
   - {fileID: 645434591}
   m_Father: {fileID: 301590531}
@@ -25423,7 +25422,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
-  m_RaycastPadding: {x: -50, y: -50, z: -50, w: -50}
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -30512,7 +30511,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 381389660}
-  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
@@ -30520,11 +30519,11 @@ RectTransform:
   - {fileID: 1677802508}
   - {fileID: 191134354}
   - {fileID: 1385227916}
-  m_Father: {fileID: 302272077}
+  m_Father: {fileID: 1907678487}
   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: 14.549988, y: 33.83}
+  m_AnchoredPosition: {x: -525.44995, y: 33.83}
   m_SizeDelta: {x: 291.45, y: 59.93}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &381389662
@@ -43850,7 +43849,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 618840975}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 559934555}
+        m_TargetAssemblyTypeName: BottomPanel, Assembly-CSharp
+        m_MethodName: ClickCategory
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &618840975
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -44691,9 +44702,9 @@ MonoBehaviour:
     callback:
       m_PersistentCalls:
         m_Calls:
-        - m_Target: {fileID: 1535761050}
+        - m_Target: {fileID: 301590533}
-          m_TargetAssemblyTypeName: HuntingPanel, Assembly-CSharp
+          m_TargetAssemblyTypeName: CanvasControl, Assembly-CSharp
-          m_MethodName: OnClick_X
+          m_MethodName: Go_Main
           m_Mode: 1
           m_Arguments:
             m_ObjectArgument: {fileID: 0}
@@ -71680,7 +71691,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
-  m_RaycastPadding: {x: -30, y: -50, z: -30, w: -50}
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -75358,7 +75369,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1285024408}
-  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
@@ -75366,7 +75377,7 @@ RectTransform:
   - {fileID: 599836673}
   - {fileID: 471004665}
   - {fileID: 1507489182}
-  m_Father: {fileID: 302272077}
+  m_Father: {fileID: 1907678487}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -103110,7 +103121,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1535761049
 RectTransform:
   m_ObjectHideFlags: 0
@@ -103157,9 +103168,6 @@ MonoBehaviour:
   Buttons:
   - {fileID: 2088694187}
   - {fileID: 425765868}
-  go_mainpaenl: {fileID: 1166114707}
-  go_botpanel: {fileID: 559934551}
-  go_x: {fileID: 645434587}
   m_ShowPanel: {fileID: 2090836414}
 --- !u!114 &1535761051
 MonoBehaviour:
@@ -120878,14 +120886,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1722250694}
-  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: 1369731816}
   - {fileID: 1692184576}
-  m_Father: {fileID: 302272077}
+  m_Father: {fileID: 1907678487}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -142396,6 +142404,44 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1889396051}
   m_CullTransparentMesh: 1
+--- !u!1 &1907678486
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1907678487}
+  m_Layer: 5
+  m_Name: Moneys
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1907678487
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1907678486}
+  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: 381389661}
+  - {fileID: 1722250695}
+  - {fileID: 1285024409}
+  m_Father: {fileID: 302272077}
+  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!1 &1931922797
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/UI/BottomPanel.cs

@@ -25,10 +25,7 @@ public class BottomPanel : MonoBehaviour
             GameManager.Event.RegistEvent(EEventType.OnReturnToGameFromStore, this.OnReturnToGameFromStoreCallback);
         }
 
-        this.ClickCategory(1);
+        CanvasControl.Ins.Go_Main();
-        MainButtonPanel.SetActive(true);
-        FullViewPanel.SetActive(false);
-        StoreBackPanel.SetActive(false);
     }
 
     private void OnDestroy()
@@ -114,16 +111,9 @@ public class BottomPanel : MonoBehaviour
     {
         GameManager.Sound.PlaySFX(ESFXType.Button_Hit);
 
-        for (int i = 0; i < Panels.Length; i++)
+        if (index == 0) CanvasControl.Ins.Go_Album();
-        {
+        else if (index == 1) CanvasControl.Ins.Go_HideUI();
-            Panels[i].SetActive(i == index);
+        else CanvasControl.Ins.Go_Shop();
-            if (i == index)
-            {
-                Vector2 pos = CategoryRTs[i].anchoredPosition;
-                pos.y = 0;
-                SelectGlow.rectTransform.anchoredPosition = pos;
-            }
-        }
     }
 
     private void MoveToStore()

Assets/Scripts/UI/CanvasControl.cs

@@ -8,24 +8,57 @@ public class CanvasControl : MonoBehaviour
         Ins = this;
     }
 
-    [SerializeField] private GameObject go_GamePanel, go_AlbumPanel, go_MainPanel, go_ShopPanel, go_TopPanel, go_BottomPanel;
+    [SerializeField] private GameObject go_AlbumPanel, go_MainPanel, go_ShopPanel, go_TopPanel, go_BottomPanel;
-    [SerializeField] private GameObject go_Bottom_LB, go_Bottom_RB;
+    [SerializeField] private GameObject go_Top_Moneys, go_Top_x, go_Bottom_LB, go_Bottom_RB;
 
     public void Go_Shop()
     {
-        go_GamePanel.SetActive(false);
         go_AlbumPanel.SetActive(false);
         go_MainPanel.SetActive(false);
 
         go_ShopPanel.SetActive(true);
         go_TopPanel.SetActive(true);
+        go_Top_x.SetActive(true);
+
         go_BottomPanel.SetActive(true);
         go_Bottom_LB.SetActive(false);
         go_Bottom_RB.SetActive(false);
     }
 
+    public void Go_Album()
+    {
+        go_AlbumPanel.SetActive(true);
+        go_MainPanel.SetActive(false);
+
+        go_ShopPanel.SetActive(false);
+        go_TopPanel.SetActive(true);
+        go_Top_x.SetActive(true);
+
+        go_BottomPanel.SetActive(false);
+        go_Bottom_LB.SetActive(false);
+        go_Bottom_RB.SetActive(false);
+    }
+
     public void Go_Main()
     {
+        go_AlbumPanel.SetActive(false);
+        go_MainPanel.SetActive(true);
 
+        go_ShopPanel.SetActive(false);
+        go_TopPanel.SetActive(true);
+        go_Top_Moneys.SetActive(true);
+        go_Top_x.SetActive(false);
+
+        go_BottomPanel.SetActive(true);
+        go_Bottom_LB.SetActive(true);
+        go_Bottom_RB.SetActive(true);
+    }
+
+    public void Go_HideUI()
+    {
+        go_Top_Moneys.SetActive(false);
+        go_Top_x.SetActive(true);
+
+        go_BottomPanel.SetActive(false);
     }
 }

Assets/Scripts/UI/HuntingPanel.cs

@@ -1,14 +1,11 @@
 using CodeJay.Classes;
-using System;
 using System.Collections.Generic;
 using UnityEngine;
-using static BansheeGz.BGDatabase.BGJsonRepoModel;
 
 public class HuntingPanel : uScrollViewMgr
 {
     [SerializeField] private TMPro.TextMeshProUGUI TitleTMP, t_type;
     [SerializeField] private GameObject[] Buttons;
-    public GameObject go_mainpaenl, go_botpanel, go_x;
     public ShowPanel m_ShowPanel;
 
     private List<HuntingSlot> _lstSlots;
@@ -63,9 +60,6 @@ public class HuntingPanel : uScrollViewMgr
     private void OnEnable()
     {
         GameManager.DB.CheckDayReset();
-        go_botpanel.SetActive(false);
-        go_x.SetActive(true);
-
         Set_UI();
     }
 
@@ -149,11 +143,4 @@ public class HuntingPanel : uScrollViewMgr
         else if (CurAlbumType > 10) CurAlbumType = 1;
         Set_UI();
     }
-    public void OnClick_X()
-    {
-        gameObject.SetActive(false);
-        go_botpanel.SetActive(true);
-        go_mainpaenl.SetActive(true);
-        go_x.SetActive(false);
-    }
 }