From 76af4a7d6647973daec8ea875e80f19df56c0b94 Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Wed, 7 Aug 2024 18:51:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=87=8D=E6=9E=84=E3=80=91=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=85=B3=E5=8D=A1=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Forest/Assets/Editor/Level/LevelEditorWindow.cs | 1 + Forest/Assets/Scripts/Framework/UI/UIWindow.cs | 1 + .../Assets/Scripts/Gameplay/Debug/SROptions.Level.cs | 1 + .../Scripts/Gameplay/{Level.meta => ForestLevel.meta} | 0 .../Gameplay/{Level => ForestLevel}/DestroyPlank.cs | 2 +- .../{Level => ForestLevel}/DestroyPlank.cs.meta | 0 .../Scripts/Gameplay/{Level => ForestLevel}/Kong.cs | 3 ++- .../Gameplay/{Level => ForestLevel}/Kong.cs.meta | 0 .../Gameplay/{Level => ForestLevel}/KongManager.cs | 11 ++++++----- .../{Level => ForestLevel}/KongManager.cs.meta | 0 .../Scripts/Gameplay/{Level => ForestLevel}/Level.cs | 1 + .../Gameplay/{Level => ForestLevel}/Level.cs.meta | 0 .../Gameplay/{Level => ForestLevel}/LevelData.cs | 4 ++-- .../Gameplay/{Level => ForestLevel}/LevelData.cs.meta | 0 .../Gameplay/{Level => ForestLevel}/LevelUtils.cs | 9 +++++---- .../{Level => ForestLevel}/LevelUtils.cs.meta | 0 .../Scripts/Gameplay/{Level => ForestLevel}/Plank.cs | 4 ++-- .../Gameplay/{Level => ForestLevel}/Plank.cs.meta | 0 .../Gameplay/{Level => ForestLevel}/PlankManager.cs | 11 ++++++----- .../{Level => ForestLevel}/PlankManager.cs.meta | 0 .../Gameplay/{Level => ForestLevel}/Thumbtack.cs | 2 +- .../Gameplay/{Level => ForestLevel}/Thumbtack.cs.meta | 0 .../Gameplay/{Level => ForestLevel}/UndoOperation.cs | 2 +- .../{Level => ForestLevel}/UndoOperation.cs.meta | 0 .../Gameplay/LoadingExecutor/LevelLoadingExecutor.cs | 1 + .../Assets/Scripts/Gameplay/Manager/LevelManager.cs | 2 +- Forest/Assets/Scripts/Gameplay/State/LevelState.cs | 1 + .../Gameplay/UI/Level/UILevelPanelController.cs | 1 + 28 files changed, 34 insertions(+), 23 deletions(-) rename Forest/Assets/Scripts/Gameplay/{Level.meta => ForestLevel.meta} (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/DestroyPlank.cs (98%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/DestroyPlank.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/Kong.cs (95%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/Kong.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/KongManager.cs (99%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/KongManager.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/Level.cs (98%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/Level.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/LevelData.cs (98%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/LevelData.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/LevelUtils.cs (99%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/LevelUtils.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/Plank.cs (98%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/Plank.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/PlankManager.cs (99%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/PlankManager.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/Thumbtack.cs (84%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/Thumbtack.cs.meta (100%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/UndoOperation.cs (95%) rename Forest/Assets/Scripts/Gameplay/{Level => ForestLevel}/UndoOperation.cs.meta (100%) diff --git a/Forest/Assets/Editor/Level/LevelEditorWindow.cs b/Forest/Assets/Editor/Level/LevelEditorWindow.cs index 18ab8ae..3552e1d 100644 --- a/Forest/Assets/Editor/Level/LevelEditorWindow.cs +++ b/Forest/Assets/Editor/Level/LevelEditorWindow.cs @@ -10,6 +10,7 @@ using Sirenix.OdinInspector; using Sirenix.Utilities.Editor; using UnityEngine.Serialization; using System.Collections.Generic; +using Gameplay.ForestLevel; using Random = UnityEngine.Random; using UnityEditor.SceneManagement; using Sirenix.OdinInspector.Editor; diff --git a/Forest/Assets/Scripts/Framework/UI/UIWindow.cs b/Forest/Assets/Scripts/Framework/UI/UIWindow.cs index 733fc2f..9ff3a47 100644 --- a/Forest/Assets/Scripts/Framework/UI/UIWindow.cs +++ b/Forest/Assets/Scripts/Framework/UI/UIWindow.cs @@ -5,6 +5,7 @@ using Gameplay.Level; using UnityEngine.UI; using Framework.Manager; using Framework.Constants; +using Gameplay.ForestLevel; namespace Framework.UI { diff --git a/Forest/Assets/Scripts/Gameplay/Debug/SROptions.Level.cs b/Forest/Assets/Scripts/Gameplay/Debug/SROptions.Level.cs index 3de018b..a3e448c 100644 --- a/Forest/Assets/Scripts/Gameplay/Debug/SROptions.Level.cs +++ b/Forest/Assets/Scripts/Gameplay/Debug/SROptions.Level.cs @@ -6,6 +6,7 @@ using Framework.Event; using Framework.Manager; using Gameplay.Level; using Framework.UI; +using Gameplay.ForestLevel; using PhxhSDK; public partial class SROptions diff --git a/Forest/Assets/Scripts/Gameplay/Level.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/DestroyPlank.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/DestroyPlank.cs similarity index 98% rename from Forest/Assets/Scripts/Gameplay/Level/DestroyPlank.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/DestroyPlank.cs index b048e0c..7f3fde0 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/DestroyPlank.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/DestroyPlank.cs @@ -3,7 +3,7 @@ using Gameplay.Manager; using UnityEngine; using PhxhSDK; -namespace Gameplay.Level +namespace Gameplay.ForestLevel { public class DestroyPlank : MonoBehaviour { diff --git a/Forest/Assets/Scripts/Gameplay/Level/DestroyPlank.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/DestroyPlank.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/DestroyPlank.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/DestroyPlank.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/Kong.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/Kong.cs similarity index 95% rename from Forest/Assets/Scripts/Gameplay/Level/Kong.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/Kong.cs index e79af6a..03ac561 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/Kong.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/Kong.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; +using Gameplay.Level; using UnityEngine; -namespace Gameplay.Level +namespace Gameplay.ForestLevel { public class Kong { diff --git a/Forest/Assets/Scripts/Gameplay/Level/Kong.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/Kong.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/Kong.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/Kong.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/KongManager.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/KongManager.cs similarity index 99% rename from Forest/Assets/Scripts/Gameplay/Level/KongManager.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/KongManager.cs index ab9aeb8..eb4223d 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/KongManager.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/KongManager.cs @@ -1,15 +1,16 @@ -using Object = UnityEngine.Object; +using System; using System.Collections.Generic; +using System.Linq; using Cysharp.Threading.Tasks; using Framework.Constants; +using Gameplay.Level; using Gameplay.Manager; -using System.Linq; -using UnityEngine; using PhxhSDK; -using System; using TMPro; +using UnityEngine; +using Object = UnityEngine.Object; -namespace Gameplay.Level +namespace Gameplay.ForestLevel { public class KongManager : Singlenton, IInitable { diff --git a/Forest/Assets/Scripts/Gameplay/Level/KongManager.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/KongManager.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/KongManager.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/KongManager.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/Level.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/Level.cs similarity index 98% rename from Forest/Assets/Scripts/Gameplay/Level/Level.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/Level.cs index c8172b1..16e78a9 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/Level.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/Level.cs @@ -4,6 +4,7 @@ using Framework.BI; using Gameplay.Manager; using LC.Newtonsoft.Json; using Cysharp.Threading.Tasks; +using Gameplay.ForestLevel; using Constants = Framework.Constants.Constants; namespace Gameplay.Level diff --git a/Forest/Assets/Scripts/Gameplay/Level/Level.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/Level.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/Level.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/Level.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/LevelData.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/LevelData.cs similarity index 98% rename from Forest/Assets/Scripts/Gameplay/Level/LevelData.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/LevelData.cs index bf12789..d849d1f 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/LevelData.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/LevelData.cs @@ -1,9 +1,9 @@ +using System; using System.Collections.Generic; using Sirenix.OdinInspector; using UnityEngine; -using System; -namespace Gameplay.Level +namespace Gameplay.ForestLevel { [Serializable] public class LevelData diff --git a/Forest/Assets/Scripts/Gameplay/Level/LevelData.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/LevelData.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/LevelData.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/LevelData.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/LevelUtils.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/LevelUtils.cs similarity index 99% rename from Forest/Assets/Scripts/Gameplay/Level/LevelUtils.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/LevelUtils.cs index 20e2d49..fbeda38 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/LevelUtils.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/LevelUtils.cs @@ -1,10 +1,11 @@ using System; -using System.Linq; -using UnityEngine; -using Framework.Constants; using System.Collections.Generic; +using System.Linq; +using Framework.Constants; +using Gameplay.Level; +using UnityEngine; -namespace Gameplay.Level +namespace Gameplay.ForestLevel { /// /// 用于检测整块木板和洞口位置关系 （并非木板的孔和洞的位置） diff --git a/Forest/Assets/Scripts/Gameplay/Level/LevelUtils.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/LevelUtils.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/LevelUtils.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/LevelUtils.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/Plank.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/Plank.cs similarity index 98% rename from Forest/Assets/Scripts/Gameplay/Level/Plank.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/Plank.cs index 232edf3..00aa4c8 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/Plank.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/Plank.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using UnityEngine; using System.Linq; using PhxhSDK; +using UnityEngine; -namespace Gameplay.Level +namespace Gameplay.ForestLevel { public class Plank : IUpdatable, IInitable { diff --git a/Forest/Assets/Scripts/Gameplay/Level/Plank.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/Plank.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/Plank.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/Plank.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/PlankManager.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/PlankManager.cs similarity index 99% rename from Forest/Assets/Scripts/Gameplay/Level/PlankManager.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/PlankManager.cs index 14cea4a..715ae40 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/PlankManager.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/PlankManager.cs @@ -1,14 +1,15 @@ -using Object = UnityEngine.Object; +using System; using System.Collections.Generic; +using System.Linq; using Cysharp.Threading.Tasks; using Framework.Constants; +using Gameplay.Level; using Gameplay.Manager; -using UnityEngine; -using System.Linq; using PhxhSDK; -using System; +using UnityEngine; +using Object = UnityEngine.Object; -namespace Gameplay.Level +namespace Gameplay.ForestLevel { public class PlankManager : Singlenton, IInitable, IUpdatable { diff --git a/Forest/Assets/Scripts/Gameplay/Level/PlankManager.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/PlankManager.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/PlankManager.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/PlankManager.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/Thumbtack.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/Thumbtack.cs similarity index 84% rename from Forest/Assets/Scripts/Gameplay/Level/Thumbtack.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/Thumbtack.cs index 84ebf34..a859214 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/Thumbtack.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/Thumbtack.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Gameplay.Level +namespace Gameplay.ForestLevel { public class Thumbtack { diff --git a/Forest/Assets/Scripts/Gameplay/Level/Thumbtack.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/Thumbtack.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/Thumbtack.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/Thumbtack.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs b/Forest/Assets/Scripts/Gameplay/ForestLevel/UndoOperation.cs similarity index 95% rename from Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs rename to Forest/Assets/Scripts/Gameplay/ForestLevel/UndoOperation.cs index 2bb90d7..58e68b8 100644 --- a/Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs +++ b/Forest/Assets/Scripts/Gameplay/ForestLevel/UndoOperation.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Gameplay.Level.Operation +namespace Gameplay.ForestLevel { public class UndoOperation { diff --git a/Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs.meta b/Forest/Assets/Scripts/Gameplay/ForestLevel/UndoOperation.cs.meta similarity index 100% rename from Forest/Assets/Scripts/Gameplay/Level/UndoOperation.cs.meta rename to Forest/Assets/Scripts/Gameplay/ForestLevel/UndoOperation.cs.meta diff --git a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/LevelLoadingExecutor.cs b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/LevelLoadingExecutor.cs index ce24213..23c2719 100644 --- a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/LevelLoadingExecutor.cs +++ b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/LevelLoadingExecutor.cs @@ -5,6 +5,7 @@ using Gameplay.Manager; using Framework.Manager; using Framework.Constants; using Cysharp.Threading.Tasks; +using Gameplay.ForestLevel; using UnityEngine.SceneManagement; using UnityEngine.AddressableAssets; using Constants = Framework.Constants.Constants; diff --git a/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs b/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs index b67e1fb..527d294 100644 --- a/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs +++ b/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs @@ -12,8 +12,8 @@ using Framework.Manager; using Framework.Constants; using Event = cfg.BI.Event; using Cysharp.Threading.Tasks; -using Gameplay.Level.Operation; using System.Collections.Generic; +using Gameplay.ForestLevel; namespace Gameplay.Manager { diff --git a/Forest/Assets/Scripts/Gameplay/State/LevelState.cs b/Forest/Assets/Scripts/Gameplay/State/LevelState.cs index 70501fd..f53dc40 100644 --- a/Forest/Assets/Scripts/Gameplay/State/LevelState.cs +++ b/Forest/Assets/Scripts/Gameplay/State/LevelState.cs @@ -10,6 +10,7 @@ using Framework.Manager; using Framework.Constants; using Gameplay.LoadingExecutor; using System.Collections.Generic; +using Gameplay.ForestLevel; using Object = UnityEngine.Object; using Vector3 = UnityEngine.Vector3; diff --git a/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelPanelController.cs b/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelPanelController.cs index 1e18aa9..4d52a37 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelPanelController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelPanelController.cs @@ -8,6 +8,7 @@ using UnityEngine.UI; using Framework.Event; using Gameplay.Manager; using Framework.Constants; +using Gameplay.ForestLevel; public class UILevelPanelController : UIWindow {