From 7d3075eaa75df9ec580774eaeba8d0b8b8db44c3 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Tue, 17 Dec 2024 16:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Art/Textures/{Title_Quan.png => Title.png} | Bin .../{Title_Quan.png.meta => Title.png.meta} | 0 Assets/Art/UIPrefab/UIModeSelect.prefab | 1 + .../_CoreKit/ActionKit/Scripts/Utility/Utility.cs | 5 +++++ Assets/Scripts/Global/Global.cs | 2 +- Assets/Scripts/UI/UIModeSelect.Designer.cs | 5 ++++- Assets/Scripts/UI/UIModuleSelect.Designer.cs | 2 +- Assets/Scripts/UI/UITools.cs | 8 +++----- 8 files changed, 15 insertions(+), 8 deletions(-) rename Assets/Art/Textures/{Title_Quan.png => Title.png} (100%) rename Assets/Art/Textures/{Title_Quan.png.meta => Title.png.meta} (100%) diff --git a/Assets/Art/Textures/Title_Quan.png b/Assets/Art/Textures/Title.png similarity index 100% rename from Assets/Art/Textures/Title_Quan.png rename to Assets/Art/Textures/Title.png diff --git a/Assets/Art/Textures/Title_Quan.png.meta b/Assets/Art/Textures/Title.png.meta similarity index 100% rename from Assets/Art/Textures/Title_Quan.png.meta rename to Assets/Art/Textures/Title.png.meta diff --git a/Assets/Art/UIPrefab/UIModeSelect.prefab b/Assets/Art/UIPrefab/UIModeSelect.prefab index d1e6e3ae..190fd031 100644 --- a/Assets/Art/UIPrefab/UIModeSelect.prefab +++ b/Assets/Art/UIPrefab/UIModeSelect.prefab @@ -496,6 +496,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 536581d84ce54d9428779ea6fe75f564, type: 3} m_Name: m_EditorClassIdentifier: + TitleImg: {fileID: 4875312519751514263} TechBtn: {fileID: 5661434251009883789} ExamBtn: {fileID: 8035740322758882133} --- !u!1 &7559888528321789001 diff --git a/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Utility/Utility.cs b/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Utility/Utility.cs index 07467389..d0992b4c 100644 --- a/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Utility/Utility.cs +++ b/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Scripts/Utility/Utility.cs @@ -244,6 +244,11 @@ public class Utility return texture2d; } + public static Sprite GetSprite(Texture2D texture2D) + { + return Sprite.Create(texture2D, + new Rect(0, 0, texture2D.width, texture2D.height), Vector2.one * 0.5f); + } /// diff --git a/Assets/Scripts/Global/Global.cs b/Assets/Scripts/Global/Global.cs index 85d54a6f..8fcbc3d4 100644 --- a/Assets/Scripts/Global/Global.cs +++ b/Assets/Scripts/Global/Global.cs @@ -16,7 +16,7 @@ public class Global : Singleton public static string deviceIconsPath = dataPath + "/DeviceIcons/"; public static string audioPath = dataPath + "/Audio/"; public static string appXmlPath = dataPath + "/App.xml"; - + public static string imagePath = dataPath + "/Image/"; public static APPSetting appSetting { get; } = new APPSetting(); diff --git a/Assets/Scripts/UI/UIModeSelect.Designer.cs b/Assets/Scripts/UI/UIModeSelect.Designer.cs index 76c5a21f..ad5060ef 100644 --- a/Assets/Scripts/UI/UIModeSelect.Designer.cs +++ b/Assets/Scripts/UI/UIModeSelect.Designer.cs @@ -5,11 +5,13 @@ using QFramework; namespace QFramework.Example { - // Generate Id:1da863ea-e248-4bf7-a751-ddc8dd413abf + // Generate Id:da6d1ff4-bfaf-4b79-b5a7-9ad638b3a626 public partial class UIModeSelect { public const string Name = "UIModeSelect"; + [SerializeField] + public UnityEngine.UI.Image TitleImg; [SerializeField] public UnityEngine.UI.Button TechBtn; [SerializeField] @@ -19,6 +21,7 @@ namespace QFramework.Example protected override void ClearUIComponents() { + TitleImg = null; TechBtn = null; ExamBtn = null; diff --git a/Assets/Scripts/UI/UIModuleSelect.Designer.cs b/Assets/Scripts/UI/UIModuleSelect.Designer.cs index a3c40f4b..06537118 100644 --- a/Assets/Scripts/UI/UIModuleSelect.Designer.cs +++ b/Assets/Scripts/UI/UIModuleSelect.Designer.cs @@ -5,7 +5,7 @@ using QFramework; namespace QFramework.Example { - // Generate Id:e7677476-3881-4b27-aa10-af0dc5d35012 + // Generate Id:6cbeaee2-18c4-4579-95c4-e6131eb650b4 public partial class UIModuleSelect { public const string Name = "UIModuleSelect"; diff --git a/Assets/Scripts/UI/UITools.cs b/Assets/Scripts/UI/UITools.cs index 469dff47..f829a955 100644 --- a/Assets/Scripts/UI/UITools.cs +++ b/Assets/Scripts/UI/UITools.cs @@ -54,13 +54,11 @@ namespace QFramework.Example GameObject Selected = icon.transform.Find("Selected").gameObject; GameObject CurSelect = obj.transform.Find("CurSelect").gameObject; mResLoader.Add2Load(localImageUrl.ToNetImageResName(), - (bool succes, IRes res) => + (bool success, IRes res) => { - if (succes) + if (success) { - var texture2D = res.Asset as Texture2D; - icon.sprite = Sprite.Create(texture2D, - new Rect(0, 0, texture2D.width, texture2D.height), Vector2.one * 0.5f); + var texture2D = Utility.GetSprite(res.Asset as Texture2D); } }); Button btn = obj.GetComponent