diff --git a/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs b/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs index e57ebf2ba..81ab83f0e 100644 --- a/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs +++ b/Assets/Scripts/Framework/OtherKit/LocalizationKit.cs @@ -1,8 +1,10 @@ -using UnityEditor; -using UnityEngine; +using UnityEngine; using UnityEngine.Localization; using UnityEngine.Localization.Settings; using UnityEngine.Localization.Tables; +#if UNITY_EDITOR +using UnityEditor; +#endif namespace AibisDream.Framework { diff --git a/Assets/Scripts/Game Loop/GlobalDataContainer.cs b/Assets/Scripts/Game Loop/GlobalDataContainer.cs index e9944417a..a65d85731 100644 --- a/Assets/Scripts/Game Loop/GlobalDataContainer.cs +++ b/Assets/Scripts/Game Loop/GlobalDataContainer.cs @@ -2,8 +2,10 @@ using System.Collections.Generic; using AibisDream.Kit; using AibisDream.Utility; -using UnityEditor; using UnityEngine; +#if UNITY_EDITOR +using UnityEditor; +#endif namespace AibisDream { diff --git a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockShape.cs b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockShape.cs index 6dccdb47c..09ae8ed12 100644 --- a/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockShape.cs +++ b/Assets/Scripts/MiniGame/BlockPuzzle/Class/BlockShape.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using AibisDream.Utility; using UnityEngine; using UnityEngine.Rendering; @@ -489,11 +489,11 @@ namespace AibisDream { // 尝试获取 prefab 的 addressable key var prefabSource = UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(_visualInstance); - if (prefabSource != null && ResourceKit.GetAssetAddressableKey(prefabSource, out string prefabPath)) - { - Debug.Log($"SaveShape prefabPath: {prefabPath}"); - _blockShapeData.prefabPath = prefabPath; - } + // if (prefabSource != null && EditorKit.GetAssetAddressableKey(prefabSource, out string prefabPath)) + // { + // Debug.Log($"SaveShape prefabPath: {prefabPath}"); + // _blockShapeData.prefabPath = prefabPath; + // } } BlockPuzzleKit.SaveBlockShapeData(_blockShapeData, _blockShapeData.shapeName); diff --git a/Assets/Scripts/Utility/CommonUtil.cs b/Assets/Scripts/Utility/CommonUtil.cs index 1bdc69c5e..5546a7766 100644 --- a/Assets/Scripts/Utility/CommonUtil.cs +++ b/Assets/Scripts/Utility/CommonUtil.cs @@ -9,7 +9,9 @@ using Unity.VisualScripting; using UnityEngine; using Object = UnityEngine.Object; using System.Globalization; +#if UNITY_EDITOR using UnityEditor; +#endif namespace AibisDream.Utility { diff --git a/Assets/Scripts/Utility/ConstRef.cs b/Assets/Scripts/Utility/ConstRef.cs index c8375a81e..9619ae78a 100644 --- a/Assets/Scripts/Utility/ConstRef.cs +++ b/Assets/Scripts/Utility/ConstRef.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using UnityEngine; namespace AibisDream.Utility @@ -46,14 +46,12 @@ namespace AibisDream.Utility #region 资产 - public const string CutLinePrefabName = "CutLine"; + public const string CutLinePrefabName = "Prefab/CutLine"; - public const string TaskItemName = "Task Item Temp"; + public const string TaskItemName = "Prefab/TaskItem"; public const string GearFollowerPrefabName = "GearFollower"; - public const string ScreenTextName = "Screen Text"; - public const string ActorPrefabName = "ActorAnima"; public const string SpriteActorPrefabName = "SpriteActor"; public const string ActorAnimaExPrefabName = "ActorAnimaEx"; @@ -62,12 +60,10 @@ namespace AibisDream.Utility public const string MobileSprite = "SpriteMobileObject"; public const string MobileObject = "PrefabMobileObject"; - public const string BubblePrefab = "NormalBubble"; + public const string BubblePrefab = "Prefab/NormalBubble"; public const string PipelinePrefabAddress = "PipelinePrefab"; - public const string RecordPrefab = "RecordItem"; - public const string BlockShapePrefab = "BlockPuzzle/BlockShape"; #endregion