From e30161078e3e220bf2903c9a0e42e0f4d96ef1ab Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 17 Sep 2021 20:46:39 +0800 Subject: *misc --- Assets/Scripts/Data.meta | 8 ++++++++ Assets/Scripts/Data/StaticDefine.cs | 21 +++++++++++++++++++++ Assets/Scripts/Data/StaticDefine.cs.meta | 11 +++++++++++ Assets/Scripts/Managers/Physics.meta | 8 ++++++++ .../Scripts/Managers/ResourceManager_Materials.cs | 19 ------------------- .../Managers/ResourceManager_Materials.cs.meta | 11 ----------- Assets/Scripts/Physics.meta | 2 +- Assets/Scripts/Unit/Components/UnitImageEffect.cs | 4 ++-- 8 files changed, 51 insertions(+), 33 deletions(-) create mode 100644 Assets/Scripts/Data.meta create mode 100644 Assets/Scripts/Data/StaticDefine.cs create mode 100644 Assets/Scripts/Data/StaticDefine.cs.meta create mode 100644 Assets/Scripts/Managers/Physics.meta delete mode 100644 Assets/Scripts/Managers/ResourceManager_Materials.cs delete mode 100644 Assets/Scripts/Managers/ResourceManager_Materials.cs.meta (limited to 'Assets/Scripts') diff --git a/Assets/Scripts/Data.meta b/Assets/Scripts/Data.meta new file mode 100644 index 00000000..ba55f9b7 --- /dev/null +++ b/Assets/Scripts/Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9a2eb51c010ce04997157e6eae03108 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Data/StaticDefine.cs b/Assets/Scripts/Data/StaticDefine.cs new file mode 100644 index 00000000..833b3ec1 --- /dev/null +++ b/Assets/Scripts/Data/StaticDefine.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public enum EImageEffectMaterails +{ + MotionBlur, + Glitch, + ColorDrift, +} + +public static class StaticDefine +{ + public static Dictionary imageEffectMaterails = new Dictionary() { + { EImageEffectMaterails.MotionBlur, "Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat"}, + { EImageEffectMaterails.Glitch, "Assets/Bundle/Materials/Unit/ImageEffect/unit_img_glitch.mat"}, + }; + + public static string bundleManifest = "bundles"; // Assets/Resources/bundles.json + +} diff --git a/Assets/Scripts/Data/StaticDefine.cs.meta b/Assets/Scripts/Data/StaticDefine.cs.meta new file mode 100644 index 00000000..66d5548c --- /dev/null +++ b/Assets/Scripts/Data/StaticDefine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f35e2b3e198e76f4e9194191af049cbc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Managers/Physics.meta b/Assets/Scripts/Managers/Physics.meta new file mode 100644 index 00000000..2296b3f8 --- /dev/null +++ b/Assets/Scripts/Managers/Physics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 603d4624aaedd794cb89497954a83f4a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Managers/ResourceManager_Materials.cs b/Assets/Scripts/Managers/ResourceManager_Materials.cs deleted file mode 100644 index 39b90606..00000000 --- a/Assets/Scripts/Managers/ResourceManager_Materials.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public partial class ResourceManager : Singleton -{ - public enum EImageEffectMaterails - { - MotionBlur, - Glitch, - ColorDrift, - } - - public readonly Dictionary imageEffectMaterails = new Dictionary() { - { EImageEffectMaterails.MotionBlur, "Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat"}, - { EImageEffectMaterails.Glitch, "Assets/Bundle/Materials/Unit/ImageEffect/unit_img_glitch.mat"}, - }; - -} \ No newline at end of file diff --git a/Assets/Scripts/Managers/ResourceManager_Materials.cs.meta b/Assets/Scripts/Managers/ResourceManager_Materials.cs.meta deleted file mode 100644 index 72214ba3..00000000 --- a/Assets/Scripts/Managers/ResourceManager_Materials.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 690fd5d9536ed074da03cf8b16bef2a5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Physics.meta b/Assets/Scripts/Physics.meta index 2296b3f8..3c22ba05 100644 --- a/Assets/Scripts/Physics.meta +++ b/Assets/Scripts/Physics.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 603d4624aaedd794cb89497954a83f4a +guid: e488506fa2c3b1942a5d0b67811b9cfc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Unit/Components/UnitImageEffect.cs b/Assets/Scripts/Unit/Components/UnitImageEffect.cs index 8af48a3e..4681826f 100644 --- a/Assets/Scripts/Unit/Components/UnitImageEffect.cs +++ b/Assets/Scripts/Unit/Components/UnitImageEffect.cs @@ -137,7 +137,7 @@ public class UnitImageEffect : UnitComponent float size = UnitManager.Instance.pc.unitDetail.snapshotBound; handle.holder = ClaimHolder(size); handle.holder.gameObject.SetActive(true); - string matPath = ResourceManager.Instance.imageEffectMaterails[ResourceManager.EImageEffectMaterails.MotionBlur]; + string matPath = StaticDefine.imageEffectMaterails[EImageEffectMaterails.MotionBlur]; handle.holder.renderer.sharedMaterial = ResourceManager.Instance.LoadAsset(matPath); MaterialPropertyBlock block = new MaterialPropertyBlock(); @@ -169,7 +169,7 @@ public class UnitImageEffect : UnitComponent float size = UnitManager.Instance.pc.unitDetail.snapshotBound; handle.holder = ClaimHolder(size); handle.holder.gameObject.SetActive(true); - string matPath = ResourceManager.Instance.imageEffectMaterails[ResourceManager.EImageEffectMaterails.Glitch]; + string matPath = StaticDefine.imageEffectMaterails[EImageEffectMaterails.Glitch]; handle.holder.renderer.sharedMaterial = ResourceManager.Instance.LoadAsset(matPath); MaterialPropertyBlock block = new MaterialPropertyBlock(); -- cgit v1.1-26-g67d0