diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs index 9b3a28f..abd3132 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityLogic/Player.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Components; -using CustomEvent; +using SepCore.Event; using SepCore.DataTable; using SepCore.Definition; using Entity.EntityData; diff --git a/Assets/GameMain/Scripts/Base/Event/Combat/ProjectileHitPresentationEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Combat/ProjectileHitPresentationEventArgs.cs index fdda881..60f805b 100644 --- a/Assets/GameMain/Scripts/Base/Event/Combat/ProjectileHitPresentationEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Combat/ProjectileHitPresentationEventArgs.cs @@ -2,7 +2,7 @@ using GameFramework; using GameFramework.Event; using UnityEngine; -namespace CustomEvent +namespace SepCore.Event { public sealed class ProjectileHitPresentationEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoHideEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoHideEventArgs.cs index 0bf353b..4a590a8 100644 --- a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoHideEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoHideEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class DisplayItemInfoHideEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoLockEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoLockEventArgs.cs index 4d03aa2..a65316f 100644 --- a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoLockEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoLockEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class DisplayItemInfoLockEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemShowEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/DisplayItemShowEventArgs.cs index a64726f..1c56be6 100644 --- a/Assets/GameMain/Scripts/Base/Event/DisplayItemShowEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/DisplayItemShowEventArgs.cs @@ -2,7 +2,7 @@ using GameFramework; using GameFramework.Event; using UnityEngine; -namespace CustomEvent +namespace SepCore.Event { public class DisplayItemShowEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/LevelProcessEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/LevelProcessEventArgs.cs index 63ed871..6da7649 100644 --- a/Assets/GameMain/Scripts/Base/Event/LevelProcessEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/LevelProcessEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class LevelProcessEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpPropSelectedEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpPropSelectedEventArgs.cs index a43be13..2c92e01 100644 --- a/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpPropSelectedEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpPropSelectedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class LevelUpPropSelectedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuAboutButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuAboutButtonClickEventArgs.cs index dcffdee..3f5416c 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuAboutButtonClickEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuAboutButtonClickEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuAboutButtonClickEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuFileButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuFileButtonClickEventArgs.cs index 5688472..e750dfb 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuFileButtonClickEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuFileButtonClickEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuFileButtonClickEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuGuideButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuGuideButtonClickEventArgs.cs index 705d342..ce13c46 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuGuideButtonClickEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuGuideButtonClickEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuGuideButtonClickEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuQuitButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuQuitButtonClickEventArgs.cs index 28444ad..64520ed 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuQuitButtonClickEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuQuitButtonClickEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuQuitButtonClickEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleConfirmEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleConfirmEventArgs.cs index dd79882..758ce8d 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleConfirmEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleConfirmEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuSelectRoleConfirmEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleReturnEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleReturnEventArgs.cs index 132569b..ec866bc 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleReturnEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleReturnEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuSelectRoleReturnEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleSelectedEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleSelectedEventArgs.cs index a3f9c52..4e5030c 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleSelectedEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSelectRoleSelectedEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuSelectRoleSelectedEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuSettingButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSettingButtonClickEventArgs.cs index 379c6c5..06f1f30 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuSettingButtonClickEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuSettingButtonClickEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuSettingButtonClickEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Menu/MenuStartGameEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Menu/MenuStartGameEventArgs.cs index 4a1db27..2ebfbc7 100644 --- a/Assets/GameMain/Scripts/Base/Event/Menu/MenuStartGameEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Menu/MenuStartGameEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class MenuStartGameEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Player/PlayerCoinChangeEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Player/PlayerCoinChangeEventArgs.cs index a3d14e2..0640d41 100644 --- a/Assets/GameMain/Scripts/Base/Event/Player/PlayerCoinChangeEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Player/PlayerCoinChangeEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class PlayerCoinChangeEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Player/PlayerExpChangeEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Player/PlayerExpChangeEventArgs.cs index bb7f046..c7a210f 100644 --- a/Assets/GameMain/Scripts/Base/Event/Player/PlayerExpChangeEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Player/PlayerExpChangeEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class PlayerExpChangeEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Player/PlayerHealthChangeEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Player/PlayerHealthChangeEventArgs.cs index ede718d..f3da9e4 100644 --- a/Assets/GameMain/Scripts/Base/Event/Player/PlayerHealthChangeEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Player/PlayerHealthChangeEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class PlayerHealthChangeEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Player/PlayerLevelUpEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Player/PlayerLevelUpEventArgs.cs index 4323875..a452a6b 100644 --- a/Assets/GameMain/Scripts/Base/Event/Player/PlayerLevelUpEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Player/PlayerLevelUpEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class PlayerLevelUpEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs index 6f4537f..0c15c1d 100644 --- a/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class RefreshEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Shop/ShopContinueEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Shop/ShopContinueEventArgs.cs index 4f5a592..5533c6b 100644 --- a/Assets/GameMain/Scripts/Base/Event/Shop/ShopContinueEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Shop/ShopContinueEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class ShopContinueEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Shop/ShopPurchaseEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Shop/ShopPurchaseEventArgs.cs index 07a254f..c78c0aa 100644 --- a/Assets/GameMain/Scripts/Base/Event/Shop/ShopPurchaseEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Shop/ShopPurchaseEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class ShopPurchaseEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Base/Event/Shop/ShopWeaponRecycleEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/Shop/ShopWeaponRecycleEventArgs.cs index 510da90..dcbb9fa 100644 --- a/Assets/GameMain/Scripts/Base/Event/Shop/ShopWeaponRecycleEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/Shop/ShopWeaponRecycleEventArgs.cs @@ -1,7 +1,7 @@ using GameFramework; using GameFramework.Event; -namespace CustomEvent +namespace SepCore.Event { public class ShopWeaponRecycleEventArgs : GameEventArgs { diff --git a/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs b/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs index 5ec354d..ba3213a 100644 --- a/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs +++ b/Assets/GameMain/Scripts/Editor/ChangeLanguageDebuggerWindow.cs @@ -1,17 +1,10 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using SepCore.Definition; +using SepCore.Definition; using GameFramework.Debugger; using GameFramework.Localization; using UnityEngine; using UnityGameFramework.Runtime; -namespace StarForce +namespace SepCore.Editor { public class ChangeLanguageDebuggerWindow : IDebuggerWindow { diff --git a/Assets/GameMain/Scripts/Editor/GameFrameworkConfigs.cs b/Assets/GameMain/Scripts/Editor/GameFrameworkConfigs.cs index bec5243..b6ec084 100644 --- a/Assets/GameMain/Scripts/Editor/GameFrameworkConfigs.cs +++ b/Assets/GameMain/Scripts/Editor/GameFrameworkConfigs.cs @@ -1,17 +1,10 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using GameFramework; +using GameFramework; using System.IO; using UnityEngine; using UnityGameFramework.Editor; using UnityGameFramework.Editor.ResourceTools; -namespace StarForce.Editor +namespace SepCore.Editor { public static class GameFrameworkConfigs { diff --git a/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs b/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs index bcb76cc..e0df895 100644 --- a/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs +++ b/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs @@ -1,4 +1,3 @@ -#if UNITY_EDITOR using System; using System.Linq; using CustomComponent; @@ -10,7 +9,7 @@ using Procedure; using UnityEditor; using UnityEngine; -namespace StarForce.Editor +namespace SepCore.Editor { public class PlayerBuffConsoleWindow : EditorWindow { @@ -27,7 +26,7 @@ namespace StarForce.Editor private float _spawnRateScaleInput = 1f; private float _extendDurationSeconds = 30f; - [MenuItem("StarForce/Debug/Player Buff Console")] + [MenuItem("SepCore/Debug/Player Buff Console")] private static void Open() { GetWindow(WindowTitle); @@ -291,4 +290,3 @@ namespace StarForce.Editor } } } -#endif \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Editor/SceneSwitchLeft.cs b/Assets/GameMain/Scripts/Editor/SceneSwitchLeft.cs index de5f845..1ef0c79 100644 --- a/Assets/GameMain/Scripts/Editor/SceneSwitchLeft.cs +++ b/Assets/GameMain/Scripts/Editor/SceneSwitchLeft.cs @@ -3,50 +3,56 @@ using UnityEditor.SceneManagement; using UnityEngine; using System.IO; -[InitializeOnLoad] -public class SceneSwitchLeft +namespace SepCore.Editor { - static SceneSwitchLeft() + [InitializeOnLoad] + public class SceneSwitchLeft { - // 注册到全局工具栏绘制事件 - SceneView.duringSceneGui += OnSceneGUI; - } - - static void OnSceneGUI(SceneView sceneView) - { - // 在 Scene 视图的左上角绘制一个下拉菜单 - Handles.BeginGUI(); - - GUILayout.BeginArea(new Rect(10, 10, 200, 100)); - if (EditorGUILayout.DropdownButton(new GUIContent("快速切换场景"), FocusType.Passive, EditorStyles.toolbarDropDown)) + static SceneSwitchLeft() { - ShowSceneMenu(); + // 注册到全局工具栏绘制事件 + SceneView.duringSceneGui += OnSceneGUI; } - GUILayout.EndArea(); - Handles.EndGUI(); - } - - static void ShowSceneMenu() - { - GenericMenu menu = new GenericMenu(); - - // 查找项目中所有启用（Enabled）的场景 - string[] sceneGuids = AssetDatabase.FindAssets("t:Scene"); - - foreach (string guid in sceneGuids) + static void OnSceneGUI(SceneView sceneView) { - string path = AssetDatabase.GUIDToAssetPath(guid); - string name = Path.GetFileNameWithoutExtension(path); + // 在 Scene 视图的左上角绘制一个下拉菜单 + Handles.BeginGUI(); - menu.AddItem(new GUIContent(name), false, () => { - if (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo()) + GUILayout.BeginArea(new Rect(10, 10, 200, 100)); + if (EditorGUILayout.DropdownButton(new GUIContent("快速切换场景"), FocusType.Passive, + EditorStyles.toolbarDropDown)) + { + ShowSceneMenu(); + } + + GUILayout.EndArea(); + + Handles.EndGUI(); + } + + static void ShowSceneMenu() + { + GenericMenu menu = new GenericMenu(); + + // 查找项目中所有启用（Enabled）的场景 + string[] sceneGuids = AssetDatabase.FindAssets("t:Scene"); + + foreach (string guid in sceneGuids) + { + string path = AssetDatabase.GUIDToAssetPath(guid); + string name = Path.GetFileNameWithoutExtension(path); + + menu.AddItem(new GUIContent(name), false, () => { - EditorSceneManager.OpenScene(path); - } - }); - } + if (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo()) + { + EditorSceneManager.OpenScene(path); + } + }); + } - menu.ShowAsContext(); + menu.ShowAsContext(); + } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Editor/VampireLike.Editor.asmdef b/Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef similarity index 59% rename from Assets/GameMain/Scripts/Editor/VampireLike.Editor.asmdef rename to Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef index fd99ead..1c95ed2 100644 --- a/Assets/GameMain/Scripts/Editor/VampireLike.Editor.asmdef +++ b/Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef @@ -1,10 +1,10 @@ { - "name": "VampireLike.Editor", - "rootNamespace": "", + "name": "SepCore.Editor", + "rootNamespace": "SepCore.Editor", "references": [ - "VampireLike", - "UnityGameFramework.Runtime", - "UnityGameFramework.Editor" + "GUID:47a82ffa13c291447ab895cd0bc251cd", + "GUID:363c5eb08ff8e6a439b85e37b8c20d96", + "GUID:a2d8a19598eca814496b089021d08d60" ], "includePlatforms": [ "Editor" @@ -17,4 +17,4 @@ "defineConstraints": [], "versionDefines": [], "noEngineReferences": false -} +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Editor/VampireLike.Editor.asmdef.meta b/Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef.meta similarity index 100% rename from Assets/GameMain/Scripts/Editor/VampireLike.Editor.asmdef.meta rename to Assets/GameMain/Scripts/Editor/SepCore.Editor.asmdef.meta diff --git a/Assets/GameMain/Scripts/Editor/VampireLikeBuildEventHandler.cs b/Assets/GameMain/Scripts/Editor/VampireLikeBuildEventHandler.cs index 1405571..e92e7ef 100644 --- a/Assets/GameMain/Scripts/Editor/VampireLikeBuildEventHandler.cs +++ b/Assets/GameMain/Scripts/Editor/VampireLikeBuildEventHandler.cs @@ -4,9 +4,9 @@ using UnityEditor; using UnityEngine; using UnityGameFramework.Editor.ResourceTools; -namespace VampireLike.Editor +namespace SepCore.Editor { - public sealed class VampireLikeBuildEventHandler : IBuildEventHandler + public sealed class DefaultBuildEventHandler : IBuildEventHandler { public bool ContinueOnFailure { diff --git a/Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs b/Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs index 9e18a12..3117175 100644 --- a/Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs +++ b/Assets/GameMain/Scripts/Presentation/Common/View/RoleItem.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoForm.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoForm.cs index 0b15368..4f55570 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoForm.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using TMPro; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs index 9122299..b259896 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfoForm/DisplayItemInfoFormController.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using SepCore.Definition; using GameFramework.Event; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudForm.cs b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudForm.cs index 250b013..3a448de 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/HudForm/HudForm.cs @@ -1,5 +1,5 @@ using CustomComponent; -using CustomEvent; +using SepCore.Event; using GameFramework.Event; using TMPro; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpForm.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpForm.cs index 052ea5a..b9bf30e 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpForm.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using TMPro; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs index f5648bf..0f05137 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/LevelUpForm/LevelUpFormController.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using CustomEvent; +using SepCore.Event; using SepCore.Definition; using CustomUtility; using GameFramework.Event; diff --git a/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopForm.cs b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopForm.cs index 5aaff87..5c5a4f5 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopForm.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using CustomEvent; +using SepCore.Event; using GameFramework.Event; using TMPro; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs index be26a73..8e6d604 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/ShopForm/ShopFormController.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using CustomEvent; +using SepCore.Event; using SepCore.Definition; using CustomUtility; using Entity.Weapon; diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs index b832332..7375429 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleForm.cs index 097c456..b82397f 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleForm.cs @@ -1,5 +1,5 @@ using System; -using CustomEvent; +using SepCore.Event; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs index 74d292d..49e6ec9 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRoleForm/SelectRoleFormController.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using SepCore.Definition; using GameFramework.Event; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuForm.cs index f50eeaf..c1536bc 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuForm.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using UnityGameFramework.Runtime; namespace UI diff --git a/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs index 4690382..1ec6c87 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/StartMenuForm/StartMenuFormController.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using SepCore.Definition; using GameFramework.Event; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs index 124d87a..7cbb739 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs @@ -1,6 +1,6 @@ using System; using CustomComponent; -using CustomEvent; +using SepCore.Event; using SepCore.DataTable; using Entity; using GameFramework.Fsm; diff --git a/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs index d5e431f..226c8ee 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs @@ -1,5 +1,5 @@ using System; -using CustomEvent; +using SepCore.Event; using SepCore.Definition; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs index 1fdc9c9..cb303e6 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/DebugPanel/RuntimeDebugPanelComponent.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using Components; -using CustomEvent; +using SepCore.Event; using SepCore.DataTable; using SepCore.Definition; using Entity; diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs index 6ebdf15..cc3ed13 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using SepCore.Definition; using Entity; using Entity.Weapon; diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs index 4c681ff..be2cd77 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs @@ -1,4 +1,4 @@ -using CustomEvent; +using SepCore.Event; using Entity; using Entity.EntityData; using Entity.Weapon;