From 87581755a17e699ff1fbf07b6574040879443ad8 Mon Sep 17 00:00:00 2001 From: Ino Date: Wed, 10 Sep 2025 14:52:48 +0900 Subject: [PATCH] ... --- Assets/Resources/Data/~$GostopData.xlsx.meta | 7 --- Assets/Scenes/Main.unity | 48 ++++++++++---------- Assets/Scripts/UI/GamePanel/GamePanel.cs | 5 +- 3 files changed, 27 insertions(+), 33 deletions(-) delete mode 100644 Assets/Resources/Data/~$GostopData.xlsx.meta diff --git a/Assets/Resources/Data/~$GostopData.xlsx.meta b/Assets/Resources/Data/~$GostopData.xlsx.meta deleted file mode 100644 index 4bd9041..0000000 --- a/Assets/Resources/Data/~$GostopData.xlsx.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 74830b876413e3c4daf2c09882674542 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index da173a2..8a461a5 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -4133,7 +4133,7 @@ RectTransform: 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: 311.10004, y: 3} + m_AnchoredPosition: {x: 330, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &235903764 @@ -9498,7 +9498,7 @@ RectTransform: 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: 45.799995, y: 0} + m_AnchoredPosition: {x: 60, y: 3} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &274555034 @@ -9532,13 +9532,13 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 + rgba: 4282701311 + m_fontColor: {r: 1, g: 0.8352941, b: 0.26666668, a: 1} + m_enableVertexGradient: 0 m_colorMode: 2 m_fontColorGradient: - topLeft: {r: 0.990566, g: 0.97506374, b: 0.4438857, a: 1} - topRight: {r: 0.990566, g: 0.97506374, b: 0.4438857, a: 1} + topLeft: {r: 0.99215686, g: 0.9764706, b: 0.44313726, a: 1} + topRight: {r: 0.99215686, g: 0.9764706, b: 0.44313726, a: 1} bottomLeft: {r: 1, g: 1, b: 1, a: 1} bottomRight: {r: 1, g: 1, b: 1, a: 1} m_fontColorGradientPreset: {fileID: 0} @@ -54348,7 +54348,7 @@ RectTransform: 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: 50, y: 3.9} + m_AnchoredPosition: {x: 60, y: 3} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1217728026 @@ -54382,9 +54382,9 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 + rgba: 4282701311 + m_fontColor: {r: 1, g: 0.8352941, b: 0.26666668, a: 1} + m_enableVertexGradient: 0 m_colorMode: 2 m_fontColorGradient: topLeft: {r: 0.99215686, g: 0.9764706, b: 0.44313726, a: 1} @@ -55252,7 +55252,7 @@ RectTransform: 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: 211, y: -1} + m_AnchoredPosition: {x: 211, y: 0} m_SizeDelta: {x: 70, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1267408350 @@ -76513,7 +76513,7 @@ RectTransform: 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: 53, y: 3.9} + m_AnchoredPosition: {x: 60, y: 3} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1445042679 @@ -76547,13 +76547,13 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 + rgba: 4282701311 + m_fontColor: {r: 1, g: 0.8352941, b: 0.26666668, a: 1} + m_enableVertexGradient: 0 m_colorMode: 2 m_fontColorGradient: - topLeft: {r: 0.990566, g: 0.97506374, b: 0.4438857, a: 1} - topRight: {r: 0.990566, g: 0.97506374, b: 0.4438857, a: 1} + topLeft: {r: 0.99215686, g: 0.9764706, b: 0.44313726, a: 1} + topRight: {r: 0.99215686, g: 0.9764706, b: 0.44313726, a: 1} bottomLeft: {r: 1, g: 1, b: 1, a: 1} bottomRight: {r: 1, g: 1, b: 1, a: 1} m_fontColorGradientPreset: {fileID: 0} @@ -79085,7 +79085,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 546.10004, y: 30.100006} + m_AnchoredPosition: {x: 561, y: 30.100006} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1627414017 @@ -84799,7 +84799,7 @@ RectTransform: 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: 51, y: 0} + m_AnchoredPosition: {x: 60, y: 3} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1667541527 @@ -84833,9 +84833,9 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 + rgba: 4282701311 + m_fontColor: {r: 1, g: 0.8352941, b: 0.26666668, a: 1} + m_enableVertexGradient: 0 m_colorMode: 2 m_fontColorGradient: topLeft: {r: 0.99215686, g: 0.9764706, b: 0.44313726, a: 1} @@ -114939,7 +114939,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -233, y: 0} + m_AnchoredPosition: {x: -278, y: 0} m_SizeDelta: {x: 320, y: 62} m_Pivot: {x: 1, y: 0} --- !u!114 &2078817708 diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index 99c20a4..8130cfd 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -414,8 +414,9 @@ public partial class GamePanel : MonoBehaviour GameManager.UI.ShowNStackPopup(EPopupType.MissionOpenPopup); - m_MissionOpenPopup_Main.gameObject.SetActive(true); - m_MissionOpenPopup_Sub.gameObject.SetActive(true); + // TODO 정인호 : 승우님이 변경한다고 하셔서 일단 미션 UI 끔 + //m_MissionOpenPopup_Main.gameObject.SetActive(true); + //m_MissionOpenPopup_Sub.gameObject.SetActive(true); } else {