diff --git a/Assets/Resources/Config.meta b/Assets/Resources/Config.meta new file mode 100644 index 00000000..4619e997 --- /dev/null +++ b/Assets/Resources/Config.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 752b543a3e4114c119db5a59b1c3a9d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/AudioConfig.asset b/Assets/Resources/Config/AudioConfig.asset similarity index 100% rename from Assets/Resources/AudioConfig.asset rename to Assets/Resources/Config/AudioConfig.asset diff --git a/Assets/Resources/AudioConfig.asset.meta b/Assets/Resources/Config/AudioConfig.asset.meta similarity index 100% rename from Assets/Resources/AudioConfig.asset.meta rename to Assets/Resources/Config/AudioConfig.asset.meta diff --git a/Assets/Resources/GameConfig.asset b/Assets/Resources/Config/GameConfig.asset similarity index 100% rename from Assets/Resources/GameConfig.asset rename to Assets/Resources/Config/GameConfig.asset diff --git a/Assets/Resources/GameConfig.asset.meta b/Assets/Resources/Config/GameConfig.asset.meta similarity index 100% rename from Assets/Resources/GameConfig.asset.meta rename to Assets/Resources/Config/GameConfig.asset.meta diff --git a/Assets/Resources/SceneRoot.prefab b/Assets/Resources/SceneRoot.prefab index e33ad6a1..96138622 100644 --- a/Assets/Resources/SceneRoot.prefab +++ b/Assets/Resources/SceneRoot.prefab @@ -75,6 +75,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5195663044226207340} + - component: {fileID: 3015936537535145384} m_Layer: 5 m_Name: UIRoot m_TagString: Untagged @@ -101,6 +102,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3015936537535145384 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5195663044226207331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5a7353a4fbe34fde8272bf21e0b8bc2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5195663044295154646 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Core/AudioManager.meta b/Assets/Scripts/Core/AudioManager.meta new file mode 100644 index 00000000..2c893ad5 --- /dev/null +++ b/Assets/Scripts/Core/AudioManager.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42c9c63c7642b45ca996759df7ba8bd9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Config/AudioConfig.cs b/Assets/Scripts/Core/AudioManager/AudioConfig.cs similarity index 100% rename from Assets/Scripts/Config/AudioConfig.cs rename to Assets/Scripts/Core/AudioManager/AudioConfig.cs diff --git a/Assets/Scripts/Config/AudioConfig.cs.meta b/Assets/Scripts/Core/AudioManager/AudioConfig.cs.meta similarity index 100% rename from Assets/Scripts/Config/AudioConfig.cs.meta rename to Assets/Scripts/Core/AudioManager/AudioConfig.cs.meta diff --git a/Assets/Scripts/Core/AudioManager.cs b/Assets/Scripts/Core/AudioManager/AudioManager.cs similarity index 100% rename from Assets/Scripts/Core/AudioManager.cs rename to Assets/Scripts/Core/AudioManager/AudioManager.cs diff --git a/Assets/Scripts/Core/AudioManager.cs.meta b/Assets/Scripts/Core/AudioManager/AudioManager.cs.meta similarity index 100% rename from Assets/Scripts/Core/AudioManager.cs.meta rename to Assets/Scripts/Core/AudioManager/AudioManager.cs.meta diff --git a/Assets/Scripts/Core/ConfigBase.cs b/Assets/Scripts/Core/ConfigBase.cs index ce1f0059..d3bdd8d0 100644 --- a/Assets/Scripts/Core/ConfigBase.cs +++ b/Assets/Scripts/Core/ConfigBase.cs @@ -9,7 +9,7 @@ public class ConfigBase : ScriptableObject where T :ScriptableObject { if (mInstance == null) { - mInstance = Resources.Load(typeof(T).ToString()); + mInstance = Resources.Load("Config/" + typeof(T).ToString()); } return mInstance; diff --git a/Assets/Scripts/Utils/UITools.meta b/Assets/Scripts/Core/UITools.meta similarity index 100% rename from Assets/Scripts/Utils/UITools.meta rename to Assets/Scripts/Core/UITools.meta diff --git a/Assets/Scripts/Utils/UITools/HUDBase.cs b/Assets/Scripts/Core/UITools/HUDBase.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/HUDBase.cs rename to Assets/Scripts/Core/UITools/HUDBase.cs diff --git a/Assets/Scripts/Utils/UITools/HUDBase.cs.meta b/Assets/Scripts/Core/UITools/HUDBase.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/HUDBase.cs.meta rename to Assets/Scripts/Core/UITools/HUDBase.cs.meta diff --git a/Assets/Scripts/Utils/UITools/Hole.meta b/Assets/Scripts/Core/UITools/Hole.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/Hole.meta rename to Assets/Scripts/Core/UITools/Hole.meta diff --git a/Assets/Scripts/Utils/UITools/Hole/Hole.cs b/Assets/Scripts/Core/UITools/Hole/Hole.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/Hole/Hole.cs rename to Assets/Scripts/Core/UITools/Hole/Hole.cs diff --git a/Assets/Scripts/Utils/UITools/Hole/Hole.cs.meta b/Assets/Scripts/Core/UITools/Hole/Hole.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/Hole/Hole.cs.meta rename to Assets/Scripts/Core/UITools/Hole/Hole.cs.meta diff --git a/Assets/Scripts/Utils/UITools/Hole/HoleImage.cs b/Assets/Scripts/Core/UITools/Hole/HoleImage.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/Hole/HoleImage.cs rename to Assets/Scripts/Core/UITools/Hole/HoleImage.cs diff --git a/Assets/Scripts/Utils/UITools/Hole/HoleImage.cs.meta b/Assets/Scripts/Core/UITools/Hole/HoleImage.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/Hole/HoleImage.cs.meta rename to Assets/Scripts/Core/UITools/Hole/HoleImage.cs.meta diff --git a/Assets/Scripts/Utils/UITools/ImageFrameAni.cs b/Assets/Scripts/Core/UITools/ImageFrameAni.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/ImageFrameAni.cs rename to Assets/Scripts/Core/UITools/ImageFrameAni.cs diff --git a/Assets/Scripts/Utils/UITools/ImageFrameAni.cs.meta b/Assets/Scripts/Core/UITools/ImageFrameAni.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/ImageFrameAni.cs.meta rename to Assets/Scripts/Core/UITools/ImageFrameAni.cs.meta diff --git a/Assets/Scripts/Utils/UITools/UIListView.meta b/Assets/Scripts/Core/UITools/ListView.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/UIListView.meta rename to Assets/Scripts/Core/UITools/ListView.meta diff --git a/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs b/Assets/Scripts/Core/UITools/ListView/ListCell.cs similarity index 84% rename from Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs rename to Assets/Scripts/Core/UITools/ListView/ListCell.cs index 88499595..d07d1e07 100644 --- a/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs +++ b/Assets/Scripts/Core/UITools/ListView/ListCell.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -public class UIListCell : MonoBehaviour +public class ListCell : MonoBehaviour { public int Index => mIndex; diff --git a/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs.meta b/Assets/Scripts/Core/UITools/ListView/ListCell.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs.meta rename to Assets/Scripts/Core/UITools/ListView/ListCell.cs.meta diff --git a/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs b/Assets/Scripts/Core/UITools/ListView/ListView.cs similarity index 94% rename from Assets/Scripts/Utils/UITools/UIListView/UIListView.cs rename to Assets/Scripts/Core/UITools/ListView/ListView.cs index deaa2bab..729b4cf2 100644 --- a/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs +++ b/Assets/Scripts/Core/UITools/ListView/ListView.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -public abstract class UIListView : MonoBehaviour, IListView where T : UIListCell +public abstract class ListView : MonoBehaviour, IListView where T : ListCell { public abstract int Count { diff --git a/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs.meta b/Assets/Scripts/Core/UITools/ListView/ListView.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/UIListView/UIListView.cs.meta rename to Assets/Scripts/Core/UITools/ListView/ListView.cs.meta diff --git a/Assets/Scripts/Core/UITools/PageView.meta b/Assets/Scripts/Core/UITools/PageView.meta new file mode 100644 index 00000000..54eb83b3 --- /dev/null +++ b/Assets/Scripts/Core/UITools/PageView.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09e2bcea44ca94bff867839de7c98977 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/CustomControl/PageSpot.cs b/Assets/Scripts/Core/UITools/PageView/PageSpot.cs similarity index 100% rename from Assets/Scripts/UI/CustomControl/PageSpot.cs rename to Assets/Scripts/Core/UITools/PageView/PageSpot.cs diff --git a/Assets/Scripts/UI/CustomControl/PageSpot.cs.meta b/Assets/Scripts/Core/UITools/PageView/PageSpot.cs.meta similarity index 100% rename from Assets/Scripts/UI/CustomControl/PageSpot.cs.meta rename to Assets/Scripts/Core/UITools/PageView/PageSpot.cs.meta diff --git a/Assets/Scripts/UI/CustomControl/PageView.cs b/Assets/Scripts/Core/UITools/PageView/PageView.cs similarity index 100% rename from Assets/Scripts/UI/CustomControl/PageView.cs rename to Assets/Scripts/Core/UITools/PageView/PageView.cs diff --git a/Assets/Scripts/UI/CustomControl/PageView.cs.meta b/Assets/Scripts/Core/UITools/PageView/PageView.cs.meta similarity index 100% rename from Assets/Scripts/UI/CustomControl/PageView.cs.meta rename to Assets/Scripts/Core/UITools/PageView/PageView.cs.meta diff --git a/Assets/Scripts/Utils/UITools/ResShower.cs b/Assets/Scripts/Core/UITools/ResShower.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/ResShower.cs rename to Assets/Scripts/Core/UITools/ResShower.cs diff --git a/Assets/Scripts/Utils/UITools/ResShower.cs.meta b/Assets/Scripts/Core/UITools/ResShower.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/ResShower.cs.meta rename to Assets/Scripts/Core/UITools/ResShower.cs.meta diff --git a/Assets/Scripts/Utils/UITools/UIButtonAni.cs b/Assets/Scripts/Core/UITools/UIButtonAni.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/UIButtonAni.cs rename to Assets/Scripts/Core/UITools/UIButtonAni.cs diff --git a/Assets/Scripts/Utils/UITools/UIButtonAni.cs.meta b/Assets/Scripts/Core/UITools/UIButtonAni.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/UIButtonAni.cs.meta rename to Assets/Scripts/Core/UITools/UIButtonAni.cs.meta diff --git a/Assets/Scripts/Utils/UITools/UIToggleSwap.cs b/Assets/Scripts/Core/UITools/UIToggleSwap.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/UIToggleSwap.cs rename to Assets/Scripts/Core/UITools/UIToggleSwap.cs diff --git a/Assets/Scripts/Utils/UITools/UIToggleSwap.cs.meta b/Assets/Scripts/Core/UITools/UIToggleSwap.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/UIToggleSwap.cs.meta rename to Assets/Scripts/Core/UITools/UIToggleSwap.cs.meta diff --git a/Assets/Scripts/Utils/UITools/XAdaptor.cs b/Assets/Scripts/Core/UITools/XAdaptor.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/XAdaptor.cs rename to Assets/Scripts/Core/UITools/XAdaptor.cs diff --git a/Assets/Scripts/Utils/UITools/XAdaptor.cs.meta b/Assets/Scripts/Core/UITools/XAdaptor.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/XAdaptor.cs.meta rename to Assets/Scripts/Core/UITools/XAdaptor.cs.meta diff --git a/Assets/Scripts/UI/CustomControl/LevelList.meta b/Assets/Scripts/UI/CustomControl/LevelPage.meta similarity index 100% rename from Assets/Scripts/UI/CustomControl/LevelList.meta rename to Assets/Scripts/UI/CustomControl/LevelPage.meta diff --git a/Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs b/Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs similarity index 100% rename from Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs rename to Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs diff --git a/Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs.meta b/Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs.meta similarity index 100% rename from Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs.meta rename to Assets/Scripts/UI/CustomControl/LevelPage/LevelCell.cs.meta diff --git a/Assets/Scripts/UI/CustomControl/LevelList/LevelPage.cs b/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs similarity index 100% rename from Assets/Scripts/UI/CustomControl/LevelList/LevelPage.cs rename to Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs diff --git a/Assets/Scripts/UI/CustomControl/LevelList/LevelPage.cs.meta b/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs.meta similarity index 100% rename from Assets/Scripts/UI/CustomControl/LevelList/LevelPage.cs.meta rename to Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs.meta diff --git a/Assets/Scripts/Utils/UITools/UIUtils.cs b/Assets/Scripts/Utils/UIUtils.cs similarity index 100% rename from Assets/Scripts/Utils/UITools/UIUtils.cs rename to Assets/Scripts/Utils/UIUtils.cs diff --git a/Assets/Scripts/Utils/UITools/UIUtils.cs.meta b/Assets/Scripts/Utils/UIUtils.cs.meta similarity index 100% rename from Assets/Scripts/Utils/UITools/UIUtils.cs.meta rename to Assets/Scripts/Utils/UIUtils.cs.meta