diff --git a/Forest/Assets/Art/Texture/Other/Btn_Level.png b/Forest/Assets/Art/Texture/Other/Btn_Level.png index c53dcf8..88ed90c 100644 Binary files a/Forest/Assets/Art/Texture/Other/Btn_Level.png and b/Forest/Assets/Art/Texture/Other/Btn_Level.png differ diff --git a/Forest/Assets/Art/Texture/Other/Btn_Level.png.meta b/Forest/Assets/Art/Texture/Other/Btn_Level.png.meta index 223e2cc..76aa3b6 100644 --- a/Forest/Assets/Art/Texture/Other/Btn_Level.png.meta +++ b/Forest/Assets/Art/Texture/Other/Btn_Level.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e6d4efff9fa93428aa59dfaaf9326a03 +guid: 7f0f00ceb6ba24be7bf9d9d7b8d33e64 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Forest/Assets/Art/Texture/Other/Btn_Start.png b/Forest/Assets/Art/Texture/Other/Btn_Start.png index d6d2022..74a5005 100644 Binary files a/Forest/Assets/Art/Texture/Other/Btn_Start.png and b/Forest/Assets/Art/Texture/Other/Btn_Start.png differ diff --git a/Forest/Assets/Art/Texture/Other/Btn_Start.png.meta b/Forest/Assets/Art/Texture/Other/Btn_Start.png.meta index c8dc40d..c2bc69e 100644 --- a/Forest/Assets/Art/Texture/Other/Btn_Start.png.meta +++ b/Forest/Assets/Art/Texture/Other/Btn_Start.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 713bf4270231a47a0ac4fdb8d40d67a4 +guid: 704c7558ebe744c52b5c37d9327860a5 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab b/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab index 55e1b4f..8af949e 100644 --- a/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab +++ b/Forest/Assets/Art/UI/Prefab/UIStartMain.prefab @@ -404,7 +404,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 713bf4270231a47a0ac4fdb8d40d67a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 704c7558ebe744c52b5c37d9327860a5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1043,7 +1043,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e6d4efff9fa93428aa59dfaaf9326a03, type: 3} + m_Sprite: {fileID: 21300000, guid: 7f0f00ceb6ba24be7bf9d9d7b8d33e64, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Forest/Assets/Scenes/StartScene.unity b/Forest/Assets/Scenes/StartScene.unity index f13ae11..fd12976 100644 --- a/Forest/Assets/Scenes/StartScene.unity +++ b/Forest/Assets/Scenes/StartScene.unity @@ -669,7 +669,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 100 + m_SortingOrder: 101 m_TargetDisplay: 0 --- !u!1 &403430398 GameObject: diff --git a/Forest/Assets/Scripts/Framework/Guide/GuideController.cs b/Forest/Assets/Scripts/Framework/Guide/GuideController.cs index d748003..4b4d5f1 100644 --- a/Forest/Assets/Scripts/Framework/Guide/GuideController.cs +++ b/Forest/Assets/Scripts/Framework/Guide/GuideController.cs @@ -69,7 +69,7 @@ public class GuideController : MonoBehaviour _imgFinger.SetActive(false); _canvas = GameObject.Find(BuildCanvas) != null ? GameObject.Find(BuildCanvas).GetComponent() - : UIRoot.Instance.root.GetComponent(); + : UIRoot.Instance.rootMatch.GetComponent(); var targetPath = GuideMananger.Instance.GetGuideMaskTarget(); target = GameObject.Find(targetPath); @@ -180,7 +180,7 @@ public class GuideController : MonoBehaviour var newPos = new Vector2(canvasPos.x + _diameter, canvasPos.y - _diameter); // 获取 Canvas 的 RectTransform - RectTransform canvasRect = _canvas.GetComponent(); + RectTransform canvasRect = _canvas.GetComponent(); // 计算屏幕边缘的范围 Vector2 minScreenPos = canvasRect.rect.min; diff --git a/Forest/Assets/Scripts/Framework/Guide/GuideMananger.cs b/Forest/Assets/Scripts/Framework/Guide/GuideMananger.cs index c5dd4e0..c2b298b 100644 --- a/Forest/Assets/Scripts/Framework/Guide/GuideMananger.cs +++ b/Forest/Assets/Scripts/Framework/Guide/GuideMananger.cs @@ -87,7 +87,7 @@ public class GuideMananger : Singlenton, IInitable /// private async UniTask InitGuideMaskUI() { - var targetCanvas = UIRoot.Instance.root; + var targetCanvas = UIRoot.Instance.rootMatch; var obj = await AssetManager.Instance.LoadAssetAsync(Constants.GuideMaskObj); _guideMask = Object.Instantiate(obj, targetCanvas.transform); _guideMask.SetActive(false);