【资源】完善购买界面、数据提示界面bug

Forest/Assets/Art/Texture/LevelPanel/Guide_Arrow.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 17945ae6df898394484db3c7a99ec086
+guid: 1c7001e0f9e3d40ef8ad745e5092872d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Forest/Assets/Art/Texture/LevelPanel/Guide_Finger.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e27addfab74959d4a9384ee5f7ddb413
+guid: 14fb0d0caf57d460c964c42868117639
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -46,8 +46,8 @@ TextureImporter:
   spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
-  alignment: 1
+  alignment: 0
-  spritePivot: {x: 0, y: 1}
+  spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
@@ -139,7 +139,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 1537655665
+    internalID: 0
     vertices: []
     indices: 
     edges: []

Forest/Assets/Art/Texture/Shop/Buy_Free.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 41f5e6d05a8ac4e58a7f56db675dd27c
+guid: d69aee07faca04c8aaa8c7669a551d05
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Forest/Assets/Art/UI/Prefab/UIBuyGoods.prefab

@@ -34,7 +34,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: 205, y: 0}
+  m_AnchoredPosition: {x: 236, y: 0}
   m_SizeDelta: {x: 195, y: 150}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1298454702036847177
@@ -523,8 +523,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 10.8342}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -21.6685}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6418488262477815009
 CanvasRenderer:
@@ -702,7 +702,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8956a65cad84840288935a890aa89a1c, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -935,7 +935,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 41f5e6d05a8ac4e58a7f56db675dd27c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d69aee07faca04c8aaa8c7669a551d05, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Forest/Assets/Art/UI/Prefab/UILevelPanel.prefab

@@ -193,8 +193,8 @@ 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: 130, y: 240}
+  m_AnchoredPosition: {x: 200, y: 330}
-  m_SizeDelta: {x: 140, y: 141.8}
+  m_SizeDelta: {x: 210, y: 147}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1732713801463255801
 CanvasRenderer:
@@ -224,7 +224,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e27addfab74959d4a9384ee5f7ddb413, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 14fb0d0caf57d460c964c42868117639, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1799,8 +1799,8 @@ 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: 130, y: -400}
+  m_AnchoredPosition: {x: 160, y: -385}
-  m_SizeDelta: {x: 140, y: 141.8}
+  m_SizeDelta: {x: 210, y: 147}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4337338171065191632
 CanvasRenderer:
@@ -1830,7 +1830,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e27addfab74959d4a9384ee5f7ddb413, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 14fb0d0caf57d460c964c42868117639, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1931,7 +1931,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -29}
-  m_SizeDelta: {x: 61.59, y: 471.6}
+  m_SizeDelta: {x: 60, y: 500}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7559599749038722353
 CanvasRenderer:
@@ -1961,7 +1961,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 17945ae6df898394484db3c7a99ec086, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1c7001e0f9e3d40ef8ad745e5092872d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Forest/Assets/Scripts/Gameplay/UI/Other/UISyncTipController.cs

@@ -16,7 +16,7 @@ public class UISyncTipController : UIWindow
     protected override void OnAwake()
     {
         _rawImageGaussianBlurMask = GetComponent<RawImage>("GaussianBlurMask");
-        _content = FindObj("SyncPanel/Txt_Content").GetComponent<TextMeshProUGUI>();
+        _content = FindObj("SyncPanel/Txt_Data").GetComponent<TextMeshProUGUI>();
         BindButton("SyncPanel/SyncBtn/Btn_Remote", SyncRemoteData);
         BindButton("SyncPanel/SyncBtn/Btn_Local", SyncLocalData);
         BindButton("SyncPanel/Btn_Close", () =>

Forest/Assets/Scripts/Gameplay/UI/Shop/UIBuyGoodsController.cs

@@ -1,6 +1,7 @@
 using TMPro;
 using cfg.BI;
 using System;
+using PhxhSDK;
 using cfg.Prop;
 using Framework;
 using UnityEngine;
@@ -29,6 +30,7 @@ public class UIBuyGoodsController : UIWindow
     private Button _btnFree;
     private PropType _currentProp;
     private PropConfig _propConfig;
+    private DataProp _curPropData;
 
     private RawImage _rawImageGaussianBlurMask;
 
@@ -68,15 +70,16 @@ public class UIBuyGoodsController : UIWindow
         _btnFree.interactable = true;
         _btnFreeObj.SetActive(!LevelManager.Instance.IsWatchAD && ADManager.Instance.CanShow(101));
 
-        var dataProp = _propConfig?.GetOrDefault(_currentProp);
+        _curPropData = _propConfig?.GetOrDefault(_currentProp);
-        if (dataProp != null)
+        if (_curPropData != null)
         {
-            _price = dataProp.Price;
+            _price = _curPropData.Price;
-            _biEvent = dataProp.BIEvent;
+            _biEvent = _curPropData.BIEvent;
-            _biEventFirst = dataProp.BIFirstEvent;
+            _biEventFirst = _curPropData.BIFirstEvent;
-            _txtPrice.text = dataProp.TxtPrice;
+            _txtPrice.text = _curPropData.TxtPrice;
-            _stringBuyContent = dataProp.SKBuy;
+            _stringBuyContent = _curPropData.SKBuy;
-            _stringTipsContent = dataProp.SKADTip;
+            _stringTipsContent = _curPropData.SKADTip;
+            _imgProp.sprite = AssetManager.Instance.LoadAsset<Sprite>(_curPropData.IconPath);
         }
 
         switch (_currentProp)
@@ -119,6 +122,13 @@ public class UIBuyGoodsController : UIWindow
         LevelManager.Instance.IsPause = true;
     }
 
+    private void CloseWin()
+    {
+        CloseWindow();
+        if (_curPropData == null) return;
+        AssetManager.Instance.Unload(_curPropData.IconPath);
+    }
+
     public void OnDestroy()
     {
         EventManager.Instance.Unregister(EventManager.EventName.RefreshCoin, RefreshCoins);
@@ -137,7 +147,7 @@ public class UIBuyGoodsController : UIWindow
     private void ADSuccessCallBack()
     {
         LevelManager.Instance.ADGetPropTips = _stringTipsContent;
-        CloseWindow();
+        CloseWin();
     }
 
     private void ADFailCallBack()
@@ -163,7 +173,7 @@ public class UIBuyGoodsController : UIWindow
             BIManager.Instance.TrackEventLevelOnce(_biEventFirst);
             _onYes?.Invoke();
             EventManager.Instance.Send(EventManager.EventName.ShowGfx);
-            CloseWindow();
+            CloseWin();
         }
         else
         {