From 1ffc102479e6f50255575278b9983f813fdf18ae Mon Sep 17 00:00:00 2001
From: zhangaotian <8474238@qq.com>
Date: Thu, 15 Aug 2024 12:04:43 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E3=80=90=E5=95=86=E5=BA=97=E3=80=91?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=B4=AD=E4=B9=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6cd54c950cbbd6f039084afb0df94244586e87a1.
---
 Forest/Assets/Art/UI/Prefab/CoinBar.prefab             |  6 +++---
 Forest/Assets/Art/UI/Prefab/UIStartMain.prefab         |  2 +-
 .../Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs  | 10 ++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Forest/Assets/Art/UI/Prefab/CoinBar.prefab b/Forest/Assets/Art/UI/Prefab/CoinBar.prefab
index 2cc8ec2..8a2f97e 100644
--- a/Forest/Assets/Art/UI/Prefab/CoinBar.prefab
+++ b/Forest/Assets/Art/UI/Prefab/CoinBar.prefab
@@ -236,7 +236,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &490868100481984922
 RectTransform:
   m_ObjectHideFlags: 0
@@ -328,7 +328,7 @@ RectTransform:
   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: 168.3, y: 0.000018746}
+  m_AnchoredPosition: {x: 141.97205, y: 0.4258}
   m_SizeDelta: {x: 145.5363, y: 62.7726}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8790278160148953539
@@ -423,7 +423,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: -21.967468, y: 0, z: -25.482178, w: 0}
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
diff --git a/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab b/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab
index 83e1cd3..d22c18f 100644
--- a/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab
+++ b/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab
@@ -755,7 +755,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2506899326898321492
 RectTransform:
   m_ObjectHideFlags: 0
diff --git a/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs b/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs
index 7e1185b..3206f4a 100644
--- a/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs
+++ b/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs
@@ -183,15 +183,9 @@ public class UIBuyGoodsController : UIWindow
         }
         else
         {
-            await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_Coin", () =>
-            {
-                CloseWindow();
-                LevelManager.Instance.IsPause = false;
-            });
-
-            /*await UIManager.Instance.OpenWindow(UIConstants.UIShop);
+            await UIManager.Instance.OpenWindow(UIConstants.UIShop);
             BIManager.Instance.TrackEvent(Event.open_shop, "InLevel");
-            BIManager.Instance.TrackEventOnce(EventFirst.fte_open_shop, "InLevel");*/
+            BIManager.Instance.TrackEventOnce(EventFirst.fte_open_shop, "InLevel");
         }
     }
 }
\ No newline at end of file