From 44f360c559acc551504ed0602c04a0d830df6150 Mon Sep 17 00:00:00 2001 From: liutao <821580467@qq.com> Date: Tue, 5 Nov 2024 12:30:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E3=80=91=E7=A7=BB=E5=8A=A8=20=E5=90=8E=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=8F=8F=E8=BE=B9=20=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{Art/Scene => Art_Out/Other}/Outline.meta | 2 +- .../Assets/Art_Out/Other/Outline/Mat.meta | 8 ++++++ .../Other/Outline/Mat}/post_outline_mat1.mat | 0 .../Outline/Mat}/post_outline_mat1.mat.meta | 0 .../Outline/Mat}/post_outline_mat1_1.mat | 0 .../Outline/Mat}/post_outline_mat1_1.mat.meta | 0 .../Other/Outline/Mat}/post_outline_mat2.mat | 0 .../Outline/Mat}/post_outline_mat2.mat.meta | 0 .../Other/Outline/Mat}/post_outline_mat3.mat | 0 .../Outline/Mat}/post_outline_mat3.mat.meta | 0 .../Other/Outline}/OutlineManager.prefab | 0 .../Other/Outline}/OutlineManager.prefab.meta | 0 .../Assets/AssetBundleCollectorSetting.asset | 16 ----------- .../Framework/Constants/Constants.Path.cs | 6 +--- .../Scripts/Gameplay/Common/PathDefine.cs | 11 ++++++++ .../Code/Scripts/Gameplay/Level/Level.cs | 28 +++++++++---------- 16 files changed, 35 insertions(+), 36 deletions(-) rename ProjectNLD/Assets/{Art/Scene => Art_Out/Other}/Outline.meta (77%) create mode 100644 ProjectNLD/Assets/Art_Out/Other/Outline/Mat.meta rename ProjectNLD/Assets/{Art/Scene/Outline => Art_Out/Other/Outline/Mat}/post_outline_mat1.mat (100%) rename ProjectNLD/Assets/{Art/Scene/Outline => Art_Out/Other/Outline/Mat}/post_outline_mat1.mat.meta (100%) rename ProjectNLD/Assets/{Art/Scene/Outline => Art_Out/Other/Outline/Mat}/post_outline_mat1_1.mat (100%) rename ProjectNLD/Assets/{Art/Scene/Outline => Art_Out/Other/Outline/Mat}/post_outline_mat1_1.mat.meta (100%) rename ProjectNLD/Assets/{Art/Scene/Outline => Art_Out/Other/Outline/Mat}/post_outline_mat2.mat (100%) rename ProjectNLD/Assets/{Art/Scene/Outline => Art_Out/Other/Outline/Mat}/post_outline_mat2.mat.meta (100%) rename ProjectNLD/Assets/{Art/Scene/Outline => Art_Out/Other/Outline/Mat}/post_outline_mat3.mat (100%) rename ProjectNLD/Assets/{Art/Scene/Outline => Art_Out/Other/Outline/Mat}/post_outline_mat3.mat.meta (100%) rename ProjectNLD/Assets/{Level/Prefabs => Art_Out/Other/Outline}/OutlineManager.prefab (100%) rename ProjectNLD/Assets/{Level/Prefabs => Art_Out/Other/Outline}/OutlineManager.prefab.meta (100%) diff --git a/ProjectNLD/Assets/Art/Scene/Outline.meta b/ProjectNLD/Assets/Art_Out/Other/Outline.meta similarity index 77% rename from ProjectNLD/Assets/Art/Scene/Outline.meta rename to ProjectNLD/Assets/Art_Out/Other/Outline.meta index 0138616465a..622f516c860 100644 --- a/ProjectNLD/Assets/Art/Scene/Outline.meta +++ b/ProjectNLD/Assets/Art_Out/Other/Outline.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cc9032fd93f7993469142dff94ce2c42 +guid: 8f4ae3b3283659246ac3197dc93e4195 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ProjectNLD/Assets/Art_Out/Other/Outline/Mat.meta b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat.meta new file mode 100644 index 00000000000..888755a7957 --- /dev/null +++ b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee3ad085dad69ae4e8a79c3696878ab8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat1.mat b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat1.mat similarity index 100% rename from ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat1.mat rename to ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat1.mat diff --git a/ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat1.mat.meta b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat1.mat.meta similarity index 100% rename from ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat1.mat.meta rename to ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat1.mat.meta diff --git a/ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat1_1.mat b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat1_1.mat similarity index 100% rename from ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat1_1.mat rename to ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat1_1.mat diff --git a/ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat1_1.mat.meta b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat1_1.mat.meta similarity index 100% rename from ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat1_1.mat.meta rename to ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat1_1.mat.meta diff --git a/ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat2.mat b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat2.mat similarity index 100% rename from ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat2.mat rename to ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat2.mat diff --git a/ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat2.mat.meta b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat2.mat.meta similarity index 100% rename from ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat2.mat.meta rename to ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat2.mat.meta diff --git a/ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat3.mat b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat3.mat similarity index 100% rename from ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat3.mat rename to ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat3.mat diff --git a/ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat3.mat.meta b/ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat3.mat.meta similarity index 100% rename from ProjectNLD/Assets/Art/Scene/Outline/post_outline_mat3.mat.meta rename to ProjectNLD/Assets/Art_Out/Other/Outline/Mat/post_outline_mat3.mat.meta diff --git a/ProjectNLD/Assets/Level/Prefabs/OutlineManager.prefab b/ProjectNLD/Assets/Art_Out/Other/Outline/OutlineManager.prefab similarity index 100% rename from ProjectNLD/Assets/Level/Prefabs/OutlineManager.prefab rename to ProjectNLD/Assets/Art_Out/Other/Outline/OutlineManager.prefab diff --git a/ProjectNLD/Assets/Level/Prefabs/OutlineManager.prefab.meta b/ProjectNLD/Assets/Art_Out/Other/Outline/OutlineManager.prefab.meta similarity index 100% rename from ProjectNLD/Assets/Level/Prefabs/OutlineManager.prefab.meta rename to ProjectNLD/Assets/Art_Out/Other/Outline/OutlineManager.prefab.meta diff --git a/ProjectNLD/Assets/AssetBundleCollectorSetting.asset b/ProjectNLD/Assets/AssetBundleCollectorSetting.asset index f28f1fb6737..c1059bd56d7 100644 --- a/ProjectNLD/Assets/AssetBundleCollectorSetting.asset +++ b/ProjectNLD/Assets/AssetBundleCollectorSetting.asset @@ -37,14 +37,6 @@ MonoBehaviour: FilterRuleName: CollectAll AssetTags: UserData: - - CollectPath: Assets/Art/Scene/Outline - CollectorGUID: cc9032fd93f7993469142dff94ce2c42 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll - AssetTags: - UserData: - CollectPath: Assets/Scenes/TeamEdit/TeamPreviewNode.prefab CollectorGUID: 8b38720b2a034bd47b42be95986ebc2f CollectorType: 0 @@ -472,14 +464,6 @@ MonoBehaviour: FilterRuleName: CollectAll AssetTags: UserData: - - CollectPath: Assets/Level/Prefabs/OutlineManager.prefab - CollectorGUID: 26b30014e5b109445a7038a9f57d85a6 - CollectorType: 0 - AddressRuleName: AddressByFileName - PackRuleName: PackDirectory - FilterRuleName: CollectAll - AssetTags: - UserData: - CollectPath: Assets/Art_Out/Other CollectorGUID: 9ea58be3619743049848efeca23df3a1 CollectorType: 0 diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/Constants/Constants.Path.cs b/ProjectNLD/Assets/Code/Scripts/Framework/Constants/Constants.Path.cs index 0531d057511..db936878546 100644 --- a/ProjectNLD/Assets/Code/Scripts/Framework/Constants/Constants.Path.cs +++ b/ProjectNLD/Assets/Code/Scripts/Framework/Constants/Constants.Path.cs @@ -17,7 +17,6 @@ namespace Framework public const string TERRAIN_TYPE_CONFIG_PATH = "Assets/Config/Maps/TerrainTypes.json"; public const string SKILL_CONFIG_FORMAT_PATH = "Assets/Config/Skills/LogicAssets/logic_{0}.json"; public const string ANIMATOR_CONFIG_FORMAT_PATH = "Assets/Config/Skills/AnimatorInfos/animator_{0}.json"; - public const string OUTLINE_POSTPROCESS_PATH = "Assets/Level/Prefabs/OutlineManager.prefab"; public const string MAP_STRUCTURE_PATH_WITHOUT_ASSET = "Art/Character/Prefabs/Structure"; public const string LEVEL_NPC_PATH_WITHOUT_ASSET = "Art/Character/Prefabs/Enemy"; @@ -45,10 +44,7 @@ namespace Framework public const string AI_ASSET_FORMAT_PATH = "Assets/Config/AI/{0}.asset"; public const string SHADER_FADEOUT_PATH = "Assets/Code/Shaders/Character/NLD_Charactor_Dead.shader"; - public const string SHADER_OUTLINE_PATH1 = "Assets/Art/Scene/Outline/post_outline_mat1.mat"; - public const string SHADER_OUTLINE_PATH1_1 = "Assets/Art/Scene/Outline/post_outline_mat1_1.mat"; - public const string SHADER_OUTLINE_PATH2 = "Assets/Art/Scene/Outline/post_outline_mat2.mat"; - public const string SHADER_OUTLINE_PATH3 = "Assets/Art/Scene/Outline/post_outline_mat3.mat"; + public const string SKILL_GORUND_HIGH_LIGHT = "Assets/Art/Gfx/Prefabs/GfxSelectedGround_white.prefab"; diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Common/PathDefine.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Common/PathDefine.cs index 0d101f46664..187a8eef9f9 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Common/PathDefine.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Common/PathDefine.cs @@ -33,6 +33,17 @@ { public const string SELECT_POINT = "Assets/Art/Other/skill_area_point.prefab"; } + + public static class Outline + { + public const string MAT1 = "Assets/Art_Out/Other/Outline/Mat/post_outline_mat1.mat"; + public const string MAT1_1 = "Assets/Art_Out/Other/Outline/Mat/post_outline_mat1_1.mat"; + public const string MAT2 = "Assets/Art_Out/Other/Outline/Mat/post_outline_mat2.mat"; + public const string MAT3 = "Assets/Art_Out/Other/Outline/Mat/post_outline_mat3.mat"; + + public const string MANAGER_PATH = "Assets/Art_Out/Other/Outline/OutlineManager.prefab"; + + } } } diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/Level.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/Level.cs index 5441e102f9f..a1a6753d1a8 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/Level.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Level/Level.cs @@ -366,11 +366,11 @@ namespace Gameplay.Level private void _UnloadOutlinePost() { - AssetManager.Instance.Unload(Constants.SHADER_OUTLINE_PATH1); - AssetManager.Instance.Unload(Constants.SHADER_OUTLINE_PATH1_1); - AssetManager.Instance.Unload(Constants.SHADER_OUTLINE_PATH2); - AssetManager.Instance.Unload(Constants.SHADER_OUTLINE_PATH3); - AssetManager.Instance.Unload(Constants.OUTLINE_POSTPROCESS_PATH); + AssetManager.Instance.Unload(PathDefine.Outline.MAT1); + AssetManager.Instance.Unload(PathDefine.Outline.MAT1_1); + AssetManager.Instance.Unload(PathDefine.Outline.MAT2); + AssetManager.Instance.Unload(PathDefine.Outline.MAT3); + AssetManager.Instance.Unload(PathDefine.Outline.MANAGER_PATH); } private void _UnLoadWeather() @@ -649,21 +649,21 @@ namespace Gameplay.Level // todo: 因为逻辑上有使用outlinemanager.instance 所以这里需要先加载 // if (!PerformanceManager.instance.data.enablePostOutline) return; // 加载shader - AssetManager.Instance.PostPreload(Constants.SHADER_OUTLINE_PATH1); - AssetManager.Instance.PostPreload(Constants.SHADER_OUTLINE_PATH1_1); - AssetManager.Instance.PostPreload(Constants.SHADER_OUTLINE_PATH2); - AssetManager.Instance.PostPreload(Constants.SHADER_OUTLINE_PATH3); + AssetManager.Instance.PostPreload(PathDefine.Outline.MAT1); + AssetManager.Instance.PostPreload(PathDefine.Outline.MAT1_1); + AssetManager.Instance.PostPreload(PathDefine.Outline.MAT2); + AssetManager.Instance.PostPreload(PathDefine.Outline.MAT3); await AssetManager.Instance.WaitAllPreloads(); var loadObj = - await AssetManager.Instance.LoadAssetAsync(Constants.OUTLINE_POSTPROCESS_PATH); + await AssetManager.Instance.LoadAssetAsync(PathDefine.Outline.MANAGER_PATH); if (loadObj != null) { Object.Instantiate(loadObj); - OutlineManager.instance.mat1 = AssetManager.Instance.GetPreLoadResult(Constants.SHADER_OUTLINE_PATH1); - OutlineManager.instance.mat1_1 = AssetManager.Instance.GetPreLoadResult(Constants.SHADER_OUTLINE_PATH1_1); - OutlineManager.instance.mat2 = AssetManager.Instance.GetPreLoadResult(Constants.SHADER_OUTLINE_PATH2); - OutlineManager.instance.mat3 = AssetManager.Instance.GetPreLoadResult(Constants.SHADER_OUTLINE_PATH3); + OutlineManager.instance.mat1 = AssetManager.Instance.GetPreLoadResult(PathDefine.Outline.MAT1); + OutlineManager.instance.mat1_1 = AssetManager.Instance.GetPreLoadResult(PathDefine.Outline.MAT1_1); + OutlineManager.instance.mat2 = AssetManager.Instance.GetPreLoadResult(PathDefine.Outline.MAT2); + OutlineManager.instance.mat3 = AssetManager.Instance.GetPreLoadResult(PathDefine.Outline.MAT3); // 全部instance之后再设置 OutlineManager.instance.mat1 = new Material(OutlineManager.instance.mat1);