From 91980574eaaaec421d7e625a60b1fee83a0ce5b9 Mon Sep 17 00:00:00 2001 From: chenxi Date: Wed, 19 Apr 2023 20:45:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Checkers/MainCheckers/BFTextureChecker.cs | 3 +- .../SubCheckers/Texture/BackgroundChecker.cs | 11 ++++- .../Texture/BattleBackgroundChecker.cs | 46 +++++++++++++++++++ .../Texture/BattleBackgroundChecker.cs.meta | 11 +++++ .../MainImporters/BFTextureImporter.cs | 1 + .../Texture/BattleBgTextureImporter.cs | 23 ++++++++++ .../Texture/BattleBgTextureImporter.cs.meta | 11 +++++ .../ResourceProcessConfig.cs | 2 + Assets/prefabs/ui/battle/battle_ui.prefab | 4 ++ 9 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BattleBackgroundChecker.cs create mode 100644 Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BattleBackgroundChecker.cs.meta create mode 100644 Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Texture/BattleBgTextureImporter.cs create mode 100644 Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Texture/BattleBgTextureImporter.cs.meta diff --git a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/MainCheckers/BFTextureChecker.cs b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/MainCheckers/BFTextureChecker.cs index d253689f8..8a1853247 100644 --- a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/MainCheckers/BFTextureChecker.cs +++ b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/MainCheckers/BFTextureChecker.cs @@ -17,7 +17,8 @@ namespace BFEditor.Resource new MainSpriteChecker(), // new LanguageSpriteChecker(), new BackgroundChecker(), - new CharacterTextureChecker(), + new BattleBackgroundChecker(), + // new CharacterTextureChecker(), new EffectTextureChecker(), new SpineTextureChecker(), // new FrameTextureChecker(), diff --git a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BackgroundChecker.cs b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BackgroundChecker.cs index a5603cda0..9510154ff 100644 --- a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BackgroundChecker.cs +++ b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BackgroundChecker.cs @@ -40,7 +40,16 @@ namespace BFEditor.Resource protected override List GetAssetPathList() { - return BFEditorUtils.GetAssetPathsWithSuffix(ResourceProcessConfig.BG_TEXTURE_FOLDER_PATH, ".png"); + var list = BFEditorUtils.GetAssetPathsWithSuffix(ResourceProcessConfig.BG_TEXTURE_FOLDER_PATH, ".png"); + var count = list.Count; + for (int i = count - 1; i >= 0; i--) + { + if (list[i].Contains(ResourceProcessConfig.BG_BATTLE_TEXTURE_FOLDER_PATH)) + { + list.RemoveAt(i); + } + } + return list; } } } diff --git a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BattleBackgroundChecker.cs b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BattleBackgroundChecker.cs new file mode 100644 index 000000000..eaa33d20c --- /dev/null +++ b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BattleBackgroundChecker.cs @@ -0,0 +1,46 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace BFEditor.Resource +{ + public class BattleBackgroundChecker : TextureSubCheckerBase + { + public override string InitName() + { + return "战斗背景大图"; + } + + public override bool DoCheck(string assetPath, TextureImporter textureImporter, Object assetObj) + { + var result = true; + if (textureImporter.textureType != TextureImporterType.Default) + { + currentBadRes.AddBadLog("textureType异常"); + result = false; + } + if (textureImporter.npotScale != TextureImporterNPOTScale.ToNearest) + { + currentBadRes.AddBadLog("npotScale异常"); + result = false; + } + if (textureImporter.mipmapEnabled) + { + currentBadRes.AddBadLog("mipmapEnable异常"); + result = false; + } + if (textureImporter.wrapMode != TextureWrapMode.Repeat) + { + currentBadRes.AddBadLog("wrapMode异常"); + result = false; + } + return result; + } + + protected override List GetAssetPathList() + { + return BFEditorUtils.GetAssetPathsWithSuffix(ResourceProcessConfig.BG_BATTLE_TEXTURE_FOLDER_PATH, ".png"); + } + } +} diff --git a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BattleBackgroundChecker.cs.meta b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BattleBackgroundChecker.cs.meta new file mode 100644 index 000000000..6e9c09eb2 --- /dev/null +++ b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceChecker/Checkers/SubCheckers/Texture/BattleBackgroundChecker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d05bbba879b7eca4a96b157bbe898604 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/MainImporters/BFTextureImporter.cs b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/MainImporters/BFTextureImporter.cs index 2555639b6..168c20c9b 100644 --- a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/MainImporters/BFTextureImporter.cs +++ b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/MainImporters/BFTextureImporter.cs @@ -15,6 +15,7 @@ namespace BFEditor.Resource new MainSpriteImpoter(), new LanguageSpriteImporter(), new BackgroundImpoter(), + new BattleBgTextureImporter(), new CharacterTextureImpoter(), new EffectTextureImpoter(), new SpineTextureImporter(), diff --git a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Texture/BattleBgTextureImporter.cs b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Texture/BattleBgTextureImporter.cs new file mode 100644 index 000000000..5627623f3 --- /dev/null +++ b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Texture/BattleBgTextureImporter.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace BFEditor.Resource +{ + public class BattleBgTextureImporter : TextureSubImporterBase + { + public override bool NeedDeal(string assetPath) + { + return assetPath.Contains(ResourceProcessConfig.BG_TEXTURE_FOLDER_PATH); + } + + protected override void DoImport(string assetPath, TextureImporter textureImporter, bool isFix) + { + textureImporter.textureType = TextureImporterType.Default; + textureImporter.npotScale = TextureImporterNPOTScale.ToNearest; + textureImporter.mipmapEnabled = false; + textureImporter.wrapMode = TextureWrapMode.Repeat; + } + } +} diff --git a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Texture/BattleBgTextureImporter.cs.meta b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Texture/BattleBgTextureImporter.cs.meta new file mode 100644 index 000000000..8109e8322 --- /dev/null +++ b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceImporter/Importers/SubImporters/Texture/BattleBgTextureImporter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7cd18975f58a34d4696715fa61ab4c37 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceProcessConfig/ResourceProcessConfig.cs b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceProcessConfig/ResourceProcessConfig.cs index 381ad9c0d..09ed4fe8b 100644 --- a/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceProcessConfig/ResourceProcessConfig.cs +++ b/Assets/Editor/BFResourceTools/ResourceProcessTools/ResourceProcessConfig/ResourceProcessConfig.cs @@ -55,6 +55,8 @@ namespace BFEditor.Resource //背景大图文件夹路径 public const string BG_TEXTURE_FOLDER_PATH = "Assets/arts/textures/background"; + //战斗背景大图文件夹路径 + public const string BG_BATTLE_TEXTURE_FOLDER_PATH = "Assets/arts/textures/background/battle/"; //ui图集文件夹 public const string UI_SPRITE_FOLDER_PATH = "Assets/arts/textures/ui"; diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index a4d9ca9a0..b4d5f348f 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -4877,6 +4877,10 @@ MonoBehaviour: hashName: 4261114232 objectType: 1 gameObject: {fileID: 6456457455187257617} + - name: battle_ui.bg + hashName: 2542042008 + objectType: 0 + gameObject: {fileID: 463079035279260010} --- !u!114 &305814484176852896 MonoBehaviour: m_ObjectHideFlags: 0