From edd7088804600cdf2376e1f2bb80504a0e41e194 Mon Sep 17 00:00:00 2001 From: SepComet <202308010230@stu.csust.edu.cn> Date: Wed, 3 Jun 2026 16:57:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=91=BD=E5=90=8D=E7=A9=BA?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 具体来说就是 SepCore 开头，然后接所属的模块名，比如 SepCore.Entity，SepCore.Simulation，SepCore.Procedure --- .../UnityWebRequestDownloadAgentHelper.cs | 1 - .../DefaultLoadResourceAgentHelper.cs | 1 - .../WebRequest/UnityWebRequestAgentHelper.cs | 1 - .../DebugPanel/RuntimeDebugPanelComponent.cs | 13 ++- .../Scripts/Base/DataTable/DRGoods.cs | 2 +- .../Scripts/Base/DataTable/DRLevel.cs | 2 +- .../Scripts/Base/DataTable/DRLevelUpReward.cs | 2 +- .../GameMain/Scripts/Base/DataTable/DRProp.cs | 2 +- .../GameMain/Scripts/Base/DataTable/DRRole.cs | 7 +- .../Scripts/Base/DataTable/DRWeapon.cs | 12 +- .../Definition/DataStruct/StatModifier.cs | 2 +- .../Entity/EntityData/AccessoryObjectData.cs | 2 +- .../Base/Entity/EntityData/CoinData.cs | 2 +- .../Base/Entity/EntityData/EffectData.cs | 2 +- .../Base/Entity/EntityData/Enemy/EnemyData.cs | 2 +- .../EntityData/Enemy/EnemyProjectileData.cs | 2 +- .../Base/Entity/EntityData/EntityDataBase.cs | 2 +- .../Scripts/Base/Entity/EntityData/ExpData.cs | 2 +- .../Base/Entity/EntityData/PlayerData.cs | 2 +- .../Entity/EntityData/TargetableObjectData.cs | 2 +- .../Entity/EntityData/Weapon/WeaponData.cs | 2 +- .../EntityData/Weapon/WeaponHandgunData.cs | 2 +- .../EntityData/Weapon/WeaponKnifeData.cs | 2 +- .../EntityData/Weapon/WeaponLanceData.cs | 2 +- .../EntityData/Weapon/WeaponLightningData.cs | 2 +- .../EntityData/Weapon/WeaponSlashData.cs | 2 +- .../Scripts/Base/Utility/AssetUtility.cs | 26 ++--- .../Scripts/Base/Utility/EnumUtility.cs | 2 +- .../Scripts/Base/Utility/JsonNetUtility.cs | 2 +- .../Scripts/Base/Utility/RarityUtility.cs | 2 +- .../Scripts/Base/Utility/WebUtility.cs | 2 +- .../Scripts/Editor/GameFrameworkConfigs.cs | 13 +-- .../Scripts/Editor/PlayerBuffConsoleWindow.cs | 8 +- .../Scripts/Editor/UIRouterComponentEditor.cs | 4 +- .../Editor/VampireLikeBuildEventHandler.cs | 8 +- .../Presentation/Common/About/AboutForm.cs | 2 +- .../Main/Context/GoodsItemContext.cs | 2 +- .../DisplayItemInfo/DisplayItemInfoContext.cs | 6 +- .../Scripts/Presentation/Main/Hud/HudForm.cs | 4 +- .../Main/LevelUp/LevelUpController.cs | 2 +- .../Presentation/Main/Shop/ShopController.cs | 4 +- .../Presentation/Menu/Setting/SettingForm.cs | 4 +- .../Presentation/Utility/ItemDescUtility.cs | 6 +- .../Scripts/Procedure/Base/ProcedureBase.cs | 2 +- .../Procedure/Base/ProcedureChangeScene.cs | 6 +- .../Procedure/Base/ProcedureCheckResources.cs | 2 +- .../Procedure/Base/ProcedureCheckVersion.cs | 2 +- .../Procedure/Base/ProcedureInitResources.cs | 2 +- .../Scripts/Procedure/Base/ProcedureLaunch.cs | 4 +- .../Procedure/Base/ProcedurePreload.cs | 4 +- .../Scripts/Procedure/Base/ProcedureSplash.cs | 2 +- .../Base/ProcedureUpdateResources.cs | 5 +- .../Procedure/Base/ProcedureUpdateVersion.cs | 2 +- .../Base/ProcedureVerifyResources.cs | 3 +- .../Scripts/Procedure/Game/GameStateBase.cs | 2 +- .../Scripts/Procedure/Game/GameStateBattle.cs | 8 +- .../Procedure/Game/GameStateLevelUp.cs | 2 +- .../Scripts/Procedure/Game/GameStateShop.cs | 2 +- .../Scripts/Procedure/Game/ProcedureGame.cs | 5 +- .../Scripts/Procedure/ProcedureMenu.cs | 2 +- .../Scripts/Procedure/ProcedureStressTest.cs | 6 +- .../Scripts/Runtime/Base/GameEntry.Custom.cs | 11 +- .../{ => AsyncTask}/AsyncTaskHelper.cs | 4 +- .../{ => AsyncTask}/AsyncTaskHelper.cs.meta | 0 .../AsyncTask/ConfigAsyncExtension.cs | 5 +- .../AsyncTask/DataTableAsyncExtension.cs | 2 +- .../AsyncTask/DownloadAsyncExtension.cs | 7 +- .../AsyncTask/EntityAsyncExtension.cs | 13 ++- .../AsyncTask/LocalizationAsyncExtension.cs | 2 +- .../AsyncTask/NetworkAsyncExtension.cs | 9 +- .../AsyncTask/ResourceAsyncExtension.cs | 10 +- .../AsyncTask/SceneAsyncExtension.cs | 9 +- .../AsyncTask/SoundAsyncExtension.cs | 22 ++-- .../AsyncTask/UIAsyncExtension.cs | 2 +- .../AsyncTask/WebRequestAsyncExtension.cs | 5 +- .../BuiltinComponent/EntityExtension.cs | 12 +- .../Localization/XmlLocalizationHelper.cs | 11 +- .../BuiltinComponent/Network/CSPacketBase.cs | 2 +- .../Network/CSPacketHeader.cs | 2 +- .../Network/NetworkChannelHelper.cs | 2 +- .../Network/Packet/CSHeartBeat.cs | 2 +- .../Network/Packet/SCHeartBeat.cs | 2 +- .../BuiltinComponent/Network/PacketBase.cs | 2 +- .../PacketHandler/SCHeartBeatHandler.cs | 2 +- .../Network/PacketHandlerBase.cs | 2 +- .../Network/PacketHeaderBase.cs | 2 +- .../BuiltinComponent/Network/PacketType.cs | 2 +- .../BuiltinComponent/Network/SCPacketBase.cs | 2 +- .../Network/SCPacketHeader.cs | 2 +- .../BuiltinComponent/SoundExtension.cs | 15 +-- .../BuiltinComponent/UIComponentExtension.cs | 2 +- .../Runtime/Components/AbsorbComponent.cs | 4 +- .../Runtime/Components/AttackComponent.cs | 6 +- .../Runtime/Components/BackpackComponent.cs | 6 +- .../Runtime/Components/HealthComponent.cs | 2 +- .../Runtime/Components/InputComponent.cs | 2 +- .../Runtime/Components/MovementComponent.cs | 8 +- .../Runtime/Components/StatComponent.cs | 2 +- .../BuiltinData/BuiltinDataComponent.cs | 31 ++--- .../DamageText/DamageTextComponent.cs | 2 +- .../DamageText/DamageTextItem.cs | 4 +- .../DamageText/DamageTextItemObject.cs | 2 +- .../EnemyManager/EnemyManagerComponent.cs | 7 +- .../CustomComponent/HPBar/HPBarComponent.cs | 5 +- .../CustomComponent/HPBar/HPBarItem.cs | 4 +- .../CustomComponent/HPBar/HPBarItemObject.cs | 11 +- .../SimulationWorld.CollisionTransient.cs | 2 +- ...SimulationWorld.EnemySeparationTemporal.cs | 2 +- .../SimulationWorld.JobDataChannel.cs | 2 +- .../SimulationWorld.JobDataConversion.cs | 2 +- .../SimulationWorld.JobDataLifecycle.cs | 2 +- .../SimulationWorld.JobOutputCommit.cs | 2 +- .../Simulation/EntityBinding.cs | 2 +- .../JobStruct/AreaCollisionHitEventData.cs | 2 +- .../JobStruct/AreaCollisionRequestData.cs | 2 +- .../BuildEnemySeparationBucketsBurstJob.cs | 2 +- .../JobStruct/CollisionCandidateData.cs | 2 +- .../JobStruct/CollisionQueryData.cs | 2 +- .../Simulation/JobStruct/EnemyJobInputData.cs | 2 +- .../JobStruct/EnemyJobOutputData.cs | 2 +- .../JobStruct/EnemyMovementBurstJob.cs | 2 +- .../JobStruct/EnemySeparationBurstJob.cs | 2 +- .../JobStruct/ProjectileJobInputData.cs | 2 +- .../JobStruct/ProjectileJobOutputData.cs | 2 +- .../JobStruct/ProjectileMovementBurstJob.cs | 2 +- .../QueryCollisionCandidatesBurstJob.cs | 2 +- .../SimulationWorld.CollisionBroadPhase.cs | 6 +- .../Jobs/SimulationWorld.CollisionPipeline.cs | 2 +- .../SimulationWorld.CollisionPresentation.cs | 6 +- .../Jobs/SimulationWorld.CollisionRequests.cs | 6 +- .../Jobs/SimulationWorld.CollisionResolve.cs | 10 +- .../Jobs/SimulationWorld.EnemyJobs.cs | 4 +- .../Jobs/SimulationWorld.ProjectileJobs.cs | 2 +- .../SimulationWorld.HitPresentation.cs | 9 +- .../SimulationWorld.Presentation.cs | 2 +- .../SimulationWorld.TransformSync.cs | 4 +- .../Simulation/SimData/EnemySimData.cs | 2 +- .../Simulation/SimData/PickupSimData.cs | 2 +- .../Simulation/SimData/ProjectileSimData.cs | 2 +- .../Simulation/SimulationTickContext.cs | 2 +- .../Simulation/SimulationWorld.EntitySync.cs | 4 +- .../SimulationWorld.EntityToSimData.cs | 7 +- .../SimulationWorld.PlayerMovement.cs | 2 +- .../SimulationWorld.RuntimeModules.cs | 2 +- .../SimulationWorld.SimEntityState.cs | 5 +- ...lationWorld.TargetSelectionSpatialIndex.cs | 4 +- .../Simulation/SimulationWorld.cs | 4 +- .../SpriteCache/SpriteCacheComponent.cs | 107 +++++++++--------- .../CustomComponent/UIRouterComponent.cs | 2 +- .../Runtime/Debugger/ProfilerMarker.cs | 2 +- .../Runtime/Entity/EntityLogic/CoinEntity.cs | 4 +- .../Runtime/Entity/EntityLogic/Effect.cs | 13 +-- .../Entity/EntityLogic/Enemy/EnemyBase.cs | 2 +- .../EntityLogic/Enemy/EnemyProjectile.cs | 4 +- .../Entity/EntityLogic/Enemy/MeleeEnemy.cs | 12 +- .../Entity/EntityLogic/Enemy/RemoteEnemy.cs | 10 +- .../Runtime/Entity/EntityLogic/EntityBase.cs | 4 +- .../Runtime/Entity/EntityLogic/ExpEntity.cs | 4 +- .../Runtime/Entity/EntityLogic/Player.cs | 12 +- .../Entity/EntityLogic/TargetableObject.cs | 8 +- .../HandgunHitMarkerAttackEffect.cs | 2 +- .../HandgunHitMarkerPoolObject.cs | 2 +- .../HandgunHitMarkerPooledInstance.cs | 2 +- .../AttackEffects/IWeaponAttackEffect.cs | 2 +- .../AttackEffects/KnifeRangeAttackEffect.cs | 2 +- .../AttackEffects/LanceThrustAttackEffect.cs | 2 +- .../LightningStrikeAttackEffect.cs | 2 +- .../AttackEffects/SlashSectorAttackEffect.cs | 2 +- .../HighestHealthTargetSelector.cs | 6 +- .../Weapon/TargetSelector/ITargetSelector.cs | 2 +- .../LowestHealthTargetSelector.cs | 6 +- .../TargetSelector/NearestTargetSelector.cs | 6 +- .../TargetSelector/TargetSelectorType.cs | 2 +- .../Entity/EntityLogic/Weapon/WeaponBase.cs | 8 +- .../WeaponHandgun.AttackState.cs | 2 +- .../WeaponHandgun.CheckInRangeState.cs | 2 +- .../WeaponHandgun.CheckOutRangeState.cs | 2 +- .../WeaponHandgun/WeaponHandgun.IdleState.cs | 2 +- .../Weapon/WeaponHandgun/WeaponHandgun.cs | 6 +- .../WeaponKnife/WeaponKnife.AttackState.cs | 2 +- .../WeaponKnife.CheckInRangeState.cs | 2 +- .../WeaponKnife.CheckOutRangeState.cs | 2 +- .../WeaponKnife/WeaponKnife.IdleState.cs | 2 +- .../Weapon/WeaponKnife/WeaponKnife.cs | 6 +- .../WeaponLance/WeaponLance.AttackState.cs | 2 +- .../WeaponLance.CheckInRangeState.cs | 2 +- .../WeaponLance.CheckOutRangeState.cs | 2 +- .../WeaponLance/WeaponLance.IdleState.cs | 2 +- .../Weapon/WeaponLance/WeaponLance.cs | 8 +- .../WeaponLightning.AttackState.cs | 2 +- .../WeaponLightning.CheckInRangeState.cs | 2 +- .../WeaponLightning.CheckOutRangeState.cs | 2 +- .../WeaponLightning.IdleState.cs | 2 +- .../Weapon/WeaponLightning/WeaponLightning.cs | 6 +- .../WeaponSlash/WeaponSlash.AttackState.cs | 2 +- .../WeaponSlash.CheckInRangeState.cs | 2 +- .../WeaponSlash.CheckOutRangeState.cs | 2 +- .../WeaponSlash/WeaponSlash.IdleState.cs | 2 +- .../Weapon/WeaponSlash/WeaponSlash.cs | 6 +- .../Scripts/Runtime/UIBase/Base/UGuiForm.cs | 2 +- .../Runtime/UIBase/Base/UIControllerBase.cs | 2 +- .../DisplayItemInfo/DisplayItemInfoUseCase.cs | 6 +- .../UIBase/Main/LevelUp/LevelUpUseCase.cs | 4 +- .../Runtime/UIBase/Main/Shop/ShopRawData.cs | 2 +- .../Runtime/UIBase/Main/Shop/ShopUseCase.cs | 37 ++---- .../Scripts/Runtime/Utility/AIUtility.cs | 15 +-- .../Runtime/Utility/EntityDataFactory.cs | 4 +- Assets/Launcher.unity | 2 +- .../EditMode/SimulationWorldTickTests.cs | 5 +- .../PlayMode/SimulationWorldPlayModeTests.cs | 6 +- 210 files changed, 461 insertions(+), 547 deletions(-) rename Assets/GameMain/Scripts/Runtime/BuiltinComponent/{ => AsyncTask}/AsyncTaskHelper.cs (99%) rename Assets/GameMain/Scripts/Runtime/BuiltinComponent/{ => AsyncTask}/AsyncTaskHelper.cs.meta (100%) diff --git a/Assets/GameFramework/Scripts/Runtime/Download/UnityWebRequestDownloadAgentHelper.cs b/Assets/GameFramework/Scripts/Runtime/Download/UnityWebRequestDownloadAgentHelper.cs index 4f01fa8..024cbcf 100644 --- a/Assets/GameFramework/Scripts/Runtime/Download/UnityWebRequestDownloadAgentHelper.cs +++ b/Assets/GameFramework/Scripts/Runtime/Download/UnityWebRequestDownloadAgentHelper.cs @@ -13,7 +13,6 @@ using UnityEngine.Networking; #else using UnityEngine.Experimental.Networking; #endif -using Utility = GameFramework.Utility; namespace UnityGameFramework.Runtime { diff --git a/Assets/GameFramework/Scripts/Runtime/Resource/DefaultLoadResourceAgentHelper.cs b/Assets/GameFramework/Scripts/Runtime/Resource/DefaultLoadResourceAgentHelper.cs index 4d98e76..a14111d 100644 --- a/Assets/GameFramework/Scripts/Runtime/Resource/DefaultLoadResourceAgentHelper.cs +++ b/Assets/GameFramework/Scripts/Runtime/Resource/DefaultLoadResourceAgentHelper.cs @@ -14,7 +14,6 @@ using UnityEngine; using UnityEngine.Networking; #endif using UnityEngine.SceneManagement; -using Utility = GameFramework.Utility; namespace UnityGameFramework.Runtime { diff --git a/Assets/GameFramework/Scripts/Runtime/WebRequest/UnityWebRequestAgentHelper.cs b/Assets/GameFramework/Scripts/Runtime/WebRequest/UnityWebRequestAgentHelper.cs index 542fa48..1c4bc3d 100644 --- a/Assets/GameFramework/Scripts/Runtime/WebRequest/UnityWebRequestAgentHelper.cs +++ b/Assets/GameFramework/Scripts/Runtime/WebRequest/UnityWebRequestAgentHelper.cs @@ -13,7 +13,6 @@ using UnityEngine.Networking; #else using UnityEngine.Experimental.Networking; #endif -using Utility = GameFramework.Utility; namespace UnityGameFramework.Runtime { diff --git a/Assets/GameMain/DebugPanel/RuntimeDebugPanelComponent.cs b/Assets/GameMain/DebugPanel/RuntimeDebugPanelComponent.cs index 884dc61..9242805 100644 --- a/Assets/GameMain/DebugPanel/RuntimeDebugPanelComponent.cs +++ b/Assets/GameMain/DebugPanel/RuntimeDebugPanelComponent.cs @@ -1,14 +1,15 @@ #if UNITY_EDITOR || DEVELOPMENT_BUILD using System; using System.Linq; -using Components; -using CustomComponent; using SepCore.Event; using SepCore.DataTable; using SepCore.Definition; -using Entity; -using CustomUtility; -using Procedure; +using SepCore.Entity; +using SepCore.Components; +using SepCore.CustomUtility; +using SepCore.Simulation; +using SepCore.EnemyManager; +using SepCore.Procedure; using UnityEngine; using UnityGameFramework.Runtime; #if ENABLE_INPUT_SYSTEM @@ -209,7 +210,7 @@ public class RuntimeDebugPanelComponent : MonoBehaviour GUILayout.Label($"Enemy Count: {enemyManager.CurrentEnemyCount}"); } - Simulation.SimulationWorld simulationWorld = GameEntry.SimulationWorld; + SimulationWorld simulationWorld = GameEntry.SimulationWorld; if (_showCollisionStats && simulationWorld != null) { GUILayout.Space(4f); diff --git a/Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs b/Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs index c2bd17e..8f82759 100644 --- a/Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRGoods.cs @@ -1,5 +1,5 @@ using SepCore.Definition; -using CustomUtility; +using SepCore.CustomUtility; using UnityGameFramework.Runtime; namespace SepCore.DataTable diff --git a/Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs b/Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs index e7369da..5bbd196 100644 --- a/Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRLevel.cs @@ -1,5 +1,5 @@ using System; -using CustomUtility; +using SepCore.CustomUtility; using SepCore.Definition; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs b/Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs index c0e9e25..01b7bda 100644 --- a/Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRLevelUpReward.cs @@ -1,6 +1,6 @@ using SepCore.Definition; using Newtonsoft.Json; -using CustomUtility; +using SepCore.CustomUtility; using UnityGameFramework.Runtime; namespace SepCore.DataTable diff --git a/Assets/GameMain/Scripts/Base/DataTable/DRProp.cs b/Assets/GameMain/Scripts/Base/DataTable/DRProp.cs index 6d168da..49f0b2f 100644 --- a/Assets/GameMain/Scripts/Base/DataTable/DRProp.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRProp.cs @@ -1,6 +1,6 @@ using SepCore.Definition; using Newtonsoft.Json; -using CustomUtility; +using SepCore.CustomUtility; using UnityGameFramework.Runtime; namespace SepCore.DataTable diff --git a/Assets/GameMain/Scripts/Base/DataTable/DRRole.cs b/Assets/GameMain/Scripts/Base/DataTable/DRRole.cs index a9ae37c..f26b01b 100644 --- a/Assets/GameMain/Scripts/Base/DataTable/DRRole.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRRole.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.IO; -using System.Text; -using SepCore.Definition; using GameFramework; -using StarForce; +using SepCore.Definition; using UnityGameFramework.Runtime; namespace SepCore.DataTable @@ -135,4 +132,4 @@ namespace SepCore.DataTable ExpRequires = expRequires.ToArray(); } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs b/Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs index 621b438..ba259f8 100644 --- a/Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs +++ b/Assets/GameMain/Scripts/Base/DataTable/DRWeapon.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using SepCore.Definition; using GameFramework; -using CustomUtility; +using SepCore.Definition; +using SepCore.CustomUtility; using Newtonsoft.Json.Linq; using UnityGameFramework.Runtime; @@ -21,7 +21,7 @@ namespace SepCore.DataTable public override int Id => m_Id; public int EntityTypeId { get; private set; } - + /// /// 获取武器名称。 /// @@ -36,12 +36,12 @@ namespace SepCore.DataTable /// 获取武器稀有度 /// public ItemRarity Rarity { get; private set; } - + /// /// 获取武器价值 /// public int Price { get; private set; } - + /// /// 获取武器价值浮动率 /// @@ -112,7 +112,7 @@ namespace SepCore.DataTable private void GeneratePropertyArray() { } - + /// /// 解参数 /// diff --git a/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs b/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs index 662f130..8614461 100644 --- a/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs +++ b/Assets/GameMain/Scripts/Base/Definition/DataStruct/StatModifier.cs @@ -1,6 +1,6 @@ using System; using SepCore.Definition; -using CustomUtility; +using SepCore.CustomUtility; using UnityGameFramework.Runtime; namespace SepCore.Definition diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs index e1d80fb..636e5db 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/AccessoryObjectData.cs @@ -2,7 +2,7 @@ using SepCore.Definition; using UnityEngine; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public abstract class AccessoryObjectData : EntityDataBase diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs index cdab08d..28fa060 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/CoinData.cs @@ -1,4 +1,4 @@ -namespace Entity.EntityData +namespace SepCore.Entity { public class CoinData : EntityDataBase { diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs index f423ca1..c594486 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/EffectData.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public class EffectData : EntityDataBase diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs index ff4b69a..db61614 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyData.cs @@ -4,7 +4,7 @@ using SepCore.DataTable; using SepCore.Definition; using UnityEngine; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public class EnemyData : TargetableObjectData diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs index caf4cc3..5153d23 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Enemy/EnemyProjectileData.cs @@ -2,7 +2,7 @@ using System; using SepCore.Definition; using UnityEngine; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public class EnemyProjectileData : EntityDataBase diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs index 4587877..322f32a 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/EntityDataBase.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public abstract class EntityDataBase diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs index f6e2405..a24a776 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/ExpData.cs @@ -1,4 +1,4 @@ -namespace Entity.EntityData +namespace SepCore.Entity { public class ExpData : EntityDataBase { diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs index c5f4fed..2070bf1 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/PlayerData.cs @@ -1,7 +1,7 @@ using System; using SepCore.Definition; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public class PlayerData : TargetableObjectData diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs index 74ca3f7..1ed4ac9 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/TargetableObjectData.cs @@ -1,7 +1,7 @@ using System; using SepCore.Definition; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public abstract class TargetableObjectData : EntityDataBase diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs index 81d3585..edcc3e9 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponData.cs @@ -4,7 +4,7 @@ using SepCore.DataTable; using SepCore.Definition; using GameFramework; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public class WeaponData : AccessoryObjectData diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs index 9b2cd85..631b82f 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponHandgunData.cs @@ -2,7 +2,7 @@ using System; using SepCore.DataTable; using SepCore.Definition; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public sealed class WeaponHandgunParamsData diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs index c8a7930..7ec192d 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponKnifeData.cs @@ -2,7 +2,7 @@ using System; using SepCore.DataTable; using SepCore.Definition; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public sealed class WeaponKnifeParamsData diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs index 5ede889..9ded75a 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLanceData.cs @@ -2,7 +2,7 @@ using System; using SepCore.DataTable; using SepCore.Definition; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public sealed class WeaponLanceParamsData diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs index 3cbc499..d29871d 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponLightningData.cs @@ -2,7 +2,7 @@ using System; using SepCore.DataTable; using SepCore.Definition; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public sealed class WeaponLightningParamsData diff --git a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs index e699303..33c1b79 100644 --- a/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs +++ b/Assets/GameMain/Scripts/Base/Entity/EntityData/Weapon/WeaponSlashData.cs @@ -2,7 +2,7 @@ using System; using SepCore.DataTable; using SepCore.Definition; -namespace Entity.EntityData +namespace SepCore.Entity { [Serializable] public sealed class WeaponSlashParamsData diff --git a/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs b/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs index 915d6a9..923bbf8 100644 --- a/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/AssetUtility.cs @@ -1,62 +1,62 @@ -using Text = GameFramework.Utility.Text; +using GameFramework; -namespace CustomUtility +namespace SepCore.CustomUtility { public static class AssetUtility { public static string GetConfigAsset(string assetName, bool fromBytes) { - return Text.Format("Assets/GameMain/Configs/{0}.{1}", assetName, fromBytes ? "bytes" : "txt"); + return Utility.Text.Format("Assets/GameMain/Configs/{0}.{1}", assetName, fromBytes ? "bytes" : "txt"); } public static string GetDataTableAsset(string assetName, bool fromBytes) { - return Text.Format("Assets/GameMain/DataTables/{0}.{1}", assetName, fromBytes ? "bytes" : "txt"); + return Utility.Text.Format("Assets/GameMain/DataTables/{0}.{1}", assetName, fromBytes ? "bytes" : "txt"); } public static string GetFontAsset(string assetName) { - return Text.Format("Assets/GameMain/Fonts/{0}.ttf", assetName); + return Utility.Text.Format("Assets/GameMain/Fonts/{0}.ttf", assetName); } public static string GetTMPFontAsset(string assetName) { - return Text.Format("Assets/GameMain/Fonts/{0}.asset", assetName); + return Utility.Text.Format("Assets/GameMain/Fonts/{0}.asset", assetName); } public static string GetSceneAsset(string assetName) { - return Text.Format("Assets/GameMain/Scenes/{0}.unity", assetName); + return Utility.Text.Format("Assets/GameMain/Scenes/{0}.unity", assetName); } public static string GetMusicAsset(string assetName) { - return Text.Format("Assets/GameMain/Music/{0}.mp3", assetName); + return Utility.Text.Format("Assets/GameMain/Music/{0}.mp3", assetName); } public static string GetSoundAsset(string assetName) { - return Text.Format("Assets/GameMain/Sounds/{0}.wav", assetName); + return Utility.Text.Format("Assets/GameMain/Sounds/{0}.wav", assetName); } public static string GetEntityAsset(string assetName) { - return Text.Format("Assets/GameMain/Entities/{0}.prefab", assetName); + return Utility.Text.Format("Assets/GameMain/Entities/{0}.prefab", assetName); } public static string GetUIFormAsset(string assetName) { - return Text.Format("Assets/GameMain/UI/UIForms/{0}.prefab", assetName); + return Utility.Text.Format("Assets/GameMain/UI/UIForms/{0}.prefab", assetName); } public static string GetUISoundAsset(string assetName) { - return Text.Format("Assets/GameMain/UI/UISounds/{0}.wav", assetName); + return Utility.Text.Format("Assets/GameMain/UI/UISounds/{0}.wav", assetName); } public static string GetUITextureIconAsset(string assetName) { - return Text.Format("Assets/GameMain/UI/UISprites/Icons/{0}.png", assetName); + return Utility.Text.Format("Assets/GameMain/UI/UISprites/Icons/{0}.png", assetName); } } } diff --git a/Assets/GameMain/Scripts/Base/Utility/EnumUtility.cs b/Assets/GameMain/Scripts/Base/Utility/EnumUtility.cs index 83de003..4753e88 100644 --- a/Assets/GameMain/Scripts/Base/Utility/EnumUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/EnumUtility.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityGameFramework.Runtime; -namespace CustomUtility +namespace SepCore.CustomUtility { public static class EnumUtility where T : struct, System.Enum { diff --git a/Assets/GameMain/Scripts/Base/Utility/JsonNetUtility.cs b/Assets/GameMain/Scripts/Base/Utility/JsonNetUtility.cs index eca13f4..189e9c0 100644 --- a/Assets/GameMain/Scripts/Base/Utility/JsonNetUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/JsonNetUtility.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace CustomUtility +namespace SepCore.CustomUtility { /// /// Newtonsoft.Json 函数集辅助器。 diff --git a/Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs b/Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs index d183948..936c26a 100644 --- a/Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/RarityUtility.cs @@ -3,7 +3,7 @@ using SepCore.Definition; using GameFramework.DataTable; using UnityEngine; -namespace CustomUtility +namespace SepCore.CustomUtility { public static class RarityUtility { diff --git a/Assets/GameMain/Scripts/Base/Utility/WebUtility.cs b/Assets/GameMain/Scripts/Base/Utility/WebUtility.cs index 8d5ceeb..5ca8427 100644 --- a/Assets/GameMain/Scripts/Base/Utility/WebUtility.cs +++ b/Assets/GameMain/Scripts/Base/Utility/WebUtility.cs @@ -7,7 +7,7 @@ using System; -namespace StarForce +namespace SepCore.CustomUtility { public static class WebUtility { diff --git a/Assets/GameMain/Scripts/Editor/GameFrameworkConfigs.cs b/Assets/GameMain/Scripts/Editor/GameFrameworkConfigs.cs index 12f265a..4f1ccb3 100644 --- a/Assets/GameMain/Scripts/Editor/GameFrameworkConfigs.cs +++ b/Assets/GameMain/Scripts/Editor/GameFrameworkConfigs.cs @@ -1,4 +1,5 @@ using System.IO; +using GameFramework; using UnityEngine; using UnityGameFramework.Editor; using UnityGameFramework.Editor.ResourceTools; @@ -8,19 +9,15 @@ namespace SepCore.Editor public static class GameFrameworkConfigs { [BuildSettingsConfigPath] public static string BuildSettingsConfig = - GameFramework.Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, - "GameMain/Configs/BuildSettings.xml")); + Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, "GameMain/Configs/BuildSettings.xml")); [ResourceCollectionConfigPath] public static string ResourceCollectionConfig = - GameFramework.Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, - "GameMain/Configs/ResourceCollection.xml")); + Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, "GameMain/Configs/ResourceCollection.xml")); [ResourceEditorConfigPath] public static string ResourceEditorConfig = - GameFramework.Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, - "GameMain/Configs/ResourceEditor.xml")); + Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, "GameMain/Configs/ResourceEditor.xml")); [ResourceBuilderConfigPath] public static string ResourceBuilderConfig = - GameFramework.Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, - "GameMain/Configs/ResourceBuilder.xml")); + Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, "GameMain/Configs/ResourceBuilder.xml")); } } diff --git a/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs b/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs index e0df895..e95785a 100644 --- a/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs +++ b/Assets/GameMain/Scripts/Editor/PlayerBuffConsoleWindow.cs @@ -1,11 +1,11 @@ using System; using System.Linq; -using CustomComponent; using SepCore.DataTable; using SepCore.Definition; -using Entity; -using CustomUtility; -using Procedure; +using SepCore.Entity; +using SepCore.Procedure; +using SepCore.EnemyManager; +using SepCore.CustomUtility; using UnityEditor; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Editor/UIRouterComponentEditor.cs b/Assets/GameMain/Scripts/Editor/UIRouterComponentEditor.cs index 928e03f..d5db972 100644 --- a/Assets/GameMain/Scripts/Editor/UIRouterComponentEditor.cs +++ b/Assets/GameMain/Scripts/Editor/UIRouterComponentEditor.cs @@ -1,13 +1,13 @@ #if UNITY_EDITOR using System; using System.Collections.Generic; -using SepCore.CustomComponent; using SepCore.UI; +using SepCore.UIRouter; using UnityEditor; using UnityEditorInternal; using UnityEngine; -namespace UIModule.Editor +namespace SepCore.Editor { [CustomEditor(typeof(UIRouterComponent))] public class UIRouterComponentEditor : UnityEditor.Editor diff --git a/Assets/GameMain/Scripts/Editor/VampireLikeBuildEventHandler.cs b/Assets/GameMain/Scripts/Editor/VampireLikeBuildEventHandler.cs index 0a771fe..f5bfba3 100644 --- a/Assets/GameMain/Scripts/Editor/VampireLikeBuildEventHandler.cs +++ b/Assets/GameMain/Scripts/Editor/VampireLikeBuildEventHandler.cs @@ -22,7 +22,7 @@ namespace SepCore.Editor string outputFullPath, bool outputPackedSelected, string outputPackedPath, string buildReportPath) { string streamingAssetsPath = - GameFramework.Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, "StreamingAssets")); + Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, "StreamingAssets")); string[] fileNames = Directory.GetFiles(streamingAssetsPath, "*", SearchOption.AllDirectories); foreach (string fileName in fileNames) { @@ -34,7 +34,7 @@ namespace SepCore.Editor File.Delete(fileName); } - GameFramework.Utility.Path.RemoveEmptyDirectory(streamingAssetsPath); + Utility.Path.RemoveEmptyDirectory(streamingAssetsPath); } public void OnPostprocessAllPlatforms(string productName, string companyName, string gameIdentifier, @@ -79,11 +79,11 @@ namespace SepCore.Editor } string streamingAssetsPath = - GameFramework.Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, "StreamingAssets")); + Utility.Path.GetRegularPath(Path.Combine(Application.dataPath, "StreamingAssets")); string[] fileNames = Directory.GetFiles(outputPackagePath, "*", SearchOption.AllDirectories); foreach (string fileName in fileNames) { - string destFileName = GameFramework.Utility.Path.GetRegularPath(Path.Combine(streamingAssetsPath, + string destFileName = Utility.Path.GetRegularPath(Path.Combine(streamingAssetsPath, fileName.Substring(outputPackagePath.Length))); FileInfo destFileInfo = new FileInfo(destFileName); if (!destFileInfo.Directory.Exists) diff --git a/Assets/GameMain/Scripts/Presentation/Common/About/AboutForm.cs b/Assets/GameMain/Scripts/Presentation/Common/About/AboutForm.cs index 88b4ca3..5d74030 100644 --- a/Assets/GameMain/Scripts/Presentation/Common/About/AboutForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Common/About/AboutForm.cs @@ -1,4 +1,4 @@ -using StarForce; +using SepCore.Sound; using UnityEngine; using UnityEngine.UI; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs index 9d4f873..c139629 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs @@ -1,4 +1,4 @@ -using CustomUtility; +using SepCore.CustomUtility; using SepCore.DataTable; using SepCore.Definition; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs index 0188c23..d72b315 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs @@ -1,8 +1,8 @@ using System; using System.Drawing; -using CustomUtility; -using Entity.EntityData; -using Entity.Weapon; +using SepCore.CustomUtility; +using SepCore.Entity; +using SepCore.Entity.Weapon; using SepCore.Definition; using UnityEngine; diff --git a/Assets/GameMain/Scripts/Presentation/Main/Hud/HudForm.cs b/Assets/GameMain/Scripts/Presentation/Main/Hud/HudForm.cs index 4405ddf..014b086 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/Hud/HudForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Hud/HudForm.cs @@ -1,6 +1,6 @@ -using CustomComponent; using SepCore.Event; using GameFramework.Event; +using SepCore.EnemyManager; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -139,4 +139,4 @@ namespace SepCore.UI #endregion } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs index 14b63c3..f3bd461 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Cysharp.Threading.Tasks; using SepCore.Event; using SepCore.Definition; -using CustomUtility; +using SepCore.CustomUtility; using GameFramework.Event; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs index daff4aa..e0b5c75 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using Cysharp.Threading.Tasks; using SepCore.Event; using SepCore.Definition; -using CustomUtility; -using Entity.Weapon; +using SepCore.CustomUtility; +using SepCore.Entity.Weapon; using GameFramework.Event; using UnityEngine; using UnityGameFramework.Runtime; diff --git a/Assets/GameMain/Scripts/Presentation/Menu/Setting/SettingForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/Setting/SettingForm.cs index 6f79a75..f661ee8 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/Setting/SettingForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/Setting/SettingForm.cs @@ -7,7 +7,7 @@ using SepCore.Definition; using GameFramework.Localization; -using StarForce; +using SepCore.Sound; using UnityEngine; using UnityEngine.UI; using UnityGameFramework.Runtime; @@ -186,4 +186,4 @@ namespace SepCore.UI _languageTipsCanvasGroup.gameObject.SetActive(_selectedLanguage != GameEntry.Localization.Language); } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Presentation/Utility/ItemDescUtility.cs b/Assets/GameMain/Scripts/Presentation/Utility/ItemDescUtility.cs index 0eea2c2..aa5be72 100644 --- a/Assets/GameMain/Scripts/Presentation/Utility/ItemDescUtility.cs +++ b/Assets/GameMain/Scripts/Presentation/Utility/ItemDescUtility.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Text; using SepCore.DataTable; using SepCore.Definition; -using Entity.EntityData; -using Entity.Weapon; +using SepCore.Entity; +using SepCore.Entity.Weapon; using System; using UnityGameFramework.Runtime; -namespace CustomUtility +namespace SepCore.CustomUtility { public static class ItemDescUtility { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureBase.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureBase.cs index d0c7c04..8abba2d 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureBase.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureBase.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace Procedure +namespace SepCore.Procedure { public abstract class ProcedureBase : GameFramework.Procedure.ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureChangeScene.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureChangeScene.cs index fcc6b11..66ec5d5 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureChangeScene.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureChangeScene.cs @@ -9,12 +9,12 @@ using SepCore.DataTable; using SepCore.Definition; using GameFramework.DataTable; using GameFramework.Event; -using StarForce; +using SepCore.Sound; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -using CustomUtility; +using SepCore.CustomUtility; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureChangeScene : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckResources.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckResources.cs index 906028a..1637c58 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckResources.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckResources.cs @@ -1,7 +1,7 @@ using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureCheckResources : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs index a22b60a..b2c1fdc 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureCheckVersion : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureInitResources.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureInitResources.cs index 46e365d..648b22b 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureInitResources.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureInitResources.cs @@ -8,7 +8,7 @@ using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureInitResources : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureLaunch.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureLaunch.cs index 99730a1..529d36e 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureLaunch.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureLaunch.cs @@ -8,11 +8,11 @@ using GameFramework.Localization; using System; using SepCore.Definition; -using StarForce; +using SepCore.Sound; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureLaunch : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs index d9e141a..02d1b5f 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs @@ -4,14 +4,14 @@ using GameFramework.Resource; using System.Collections.Generic; using SepCore.DataTable; using SepCore.Definition; -using CustomUtility; +using SepCore.CustomUtility; using TMPro; using SepCore.UI; using UnityEngine; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedurePreload : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureSplash.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureSplash.cs index 01a91d4..28b716b 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureSplash.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureSplash.cs @@ -9,7 +9,7 @@ using GameFramework.Resource; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureSplash : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs index d1611a2..9186357 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureUpdateResources : ProcedureBase { @@ -93,8 +93,7 @@ namespace Procedure { if (m_UpdateResourceForm == null) { - m_UpdateResourceForm = Object.Instantiate(GameEntry.BuiltinData.UpdateResourceFormTemplate) - .GetComponent(); + m_UpdateResourceForm = Object.Instantiate(GameEntry.BuiltinData.UpdateResourceFormTemplate).GetComponent(); } Log.Info("Start update resources..."); diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateVersion.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateVersion.cs index faccc04..28f832f 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateVersion.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateVersion.cs @@ -9,7 +9,7 @@ using GameFramework.Resource; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureUpdateVersion : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureVerifyResources.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureVerifyResources.cs index 7e0dace..82314ae 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureVerifyResources.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureVerifyResources.cs @@ -1,9 +1,8 @@ using GameFramework.Event; -using StarForce; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureVerifyResources : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateBase.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateBase.cs index 5105c0f..fd4cfee 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateBase.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateBase.cs @@ -4,7 +4,7 @@ using GameFramework.Fsm; using GameFramework.Procedure; using UnityEngine; -namespace Procedure +namespace SepCore.Procedure { public abstract class GameStateBase { diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs index 7cbb739..4ed6f24 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs @@ -1,14 +1,14 @@ using System; -using CustomComponent; using SepCore.Event; using SepCore.DataTable; -using Entity; +using SepCore.Entity; using GameFramework.Fsm; using GameFramework.Procedure; -using Simulation; +using SepCore.EnemyManager; +using SepCore.Simulation; using UnityEngine; -namespace Procedure +namespace SepCore.Procedure { public class GameStateBattle : GameStateBase { diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs index a13c3d0..d8708ef 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs @@ -5,7 +5,7 @@ using GameFramework.Procedure; using SepCore.UI; using UnityGameFramework.Runtime; -namespace Procedure +namespace SepCore.Procedure { public class GameStateLevelUp : GameStateBase { diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs index 7249237..07497fd 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs @@ -5,7 +5,7 @@ using GameFramework.Procedure; using SepCore.UI; using UnityGameFramework.Runtime; -namespace Procedure +namespace SepCore.Procedure { public class GameStateShop : GameStateBase { diff --git a/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs b/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs index 0a9796e..c45ccad 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs @@ -2,15 +2,14 @@ using System.Collections.Generic; using Cysharp.Threading.Tasks; using SepCore.DataTable; using SepCore.Definition; -using Entity; -using Entity.EntityData; +using SepCore.Entity; using GameFramework.Event; using GameFramework.Fsm; using GameFramework.Procedure; using UnityGameFramework.Runtime; using SepCore.UI; -namespace Procedure +namespace SepCore.Procedure { public enum GameStateType { diff --git a/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs b/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs index dd94fe4..e0b7bc2 100644 --- a/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs +++ b/Assets/GameMain/Scripts/Procedure/ProcedureMenu.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityGameFramework.Runtime; using ProcedureOwner = GameFramework.Fsm.IFsm; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureMenu : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Procedure/ProcedureStressTest.cs b/Assets/GameMain/Scripts/Procedure/ProcedureStressTest.cs index e859aae..76f223c 100644 --- a/Assets/GameMain/Scripts/Procedure/ProcedureStressTest.cs +++ b/Assets/GameMain/Scripts/Procedure/ProcedureStressTest.cs @@ -1,11 +1,9 @@ -using CustomComponent; -using Entity.EntityData; using GameFramework.Fsm; using GameFramework.Procedure; -using StarForce; +using SepCore.EnemyManager; using UnityGameFramework.Runtime; -namespace Procedure +namespace SepCore.Procedure { public class ProcedureStressTest : ProcedureBase { diff --git a/Assets/GameMain/Scripts/Runtime/Base/GameEntry.Custom.cs b/Assets/GameMain/Scripts/Runtime/Base/GameEntry.Custom.cs index 09f7c76..419e6e5 100644 --- a/Assets/GameMain/Scripts/Runtime/Base/GameEntry.Custom.cs +++ b/Assets/GameMain/Scripts/Runtime/Base/GameEntry.Custom.cs @@ -1,7 +1,10 @@ -using CustomComponent; -using SepCore.CustomComponent; -using Simulation; -using UnityEngine; +using SepCore.BuiltinData; +using SepCore.DamageText; +using SepCore.EnemyManager; +using SepCore.HPBar; +using SepCore.SpriteCache; +using SepCore.UIRouter; +using SepCore.Simulation; /// /// 游戏入口。 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTaskHelper.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/AsyncTaskHelper.cs similarity index 99% rename from Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTaskHelper.cs rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/AsyncTaskHelper.cs index 1371cf2..001196d 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTaskHelper.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/AsyncTaskHelper.cs @@ -3,7 +3,7 @@ using System.Threading; using Cysharp.Threading.Tasks; using GameFramework.Event; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// 异步任务辅助类，用于将事件回调转换为 UniTask @@ -124,4 +124,4 @@ namespace UnityGameFramework.Runtime.AsyncTask return tcs.Task; } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTaskHelper.cs.meta b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/AsyncTaskHelper.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTaskHelper.cs.meta rename to Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/AsyncTaskHelper.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ConfigAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ConfigAsyncExtension.cs index 3dd4b49..fbc0340 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ConfigAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ConfigAsyncExtension.cs @@ -1,10 +1,7 @@ -using System; using Cysharp.Threading.Tasks; -using GameFramework; -using GameFramework.Config; using UnityGameFramework.Runtime; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// Config 异步扩展方法 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/DataTableAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/DataTableAsyncExtension.cs index b9178a3..fa6ddb2 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/DataTableAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/DataTableAsyncExtension.cs @@ -5,7 +5,7 @@ using GameFramework.DataTable; using SepCore.DataTable; using UnityGameFramework.Runtime; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// DataTable 异步扩展方法 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/DownloadAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/DownloadAsyncExtension.cs index d3772a8..b19d379 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/DownloadAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/DownloadAsyncExtension.cs @@ -1,10 +1,9 @@ -using System; using Cysharp.Threading.Tasks; -using GameFramework; -using GameFramework.Download; using UnityGameFramework.Runtime; +using DownloadFailureEventArgs = UnityGameFramework.Runtime.DownloadFailureEventArgs; +using DownloadSuccessEventArgs = UnityGameFramework.Runtime.DownloadSuccessEventArgs; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// Download 异步扩展方法 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/EntityAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/EntityAsyncExtension.cs index 621e82a..ea447e4 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/EntityAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/EntityAsyncExtension.cs @@ -1,10 +1,11 @@ using System; using Cysharp.Threading.Tasks; -using GameFramework; -using GameFramework.Entity; using UnityGameFramework.Runtime; +using HideEntityCompleteEventArgs = UnityGameFramework.Runtime.HideEntityCompleteEventArgs; +using ShowEntityFailureEventArgs = UnityGameFramework.Runtime.ShowEntityFailureEventArgs; +using ShowEntitySuccessEventArgs = UnityGameFramework.Runtime.ShowEntitySuccessEventArgs; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// Entity 异步扩展方法 @@ -22,7 +23,7 @@ namespace UnityGameFramework.Runtime.AsyncTask /// 用户自定义数据 /// 超时时间（秒），0表示不超时 /// 显示的实体 - public static UniTask ShowEntityAsync(this EntityComponent entityComponent, + public static UniTask ShowEntityAsync(this EntityComponent entityComponent, int entityId, Type entityLogicType, string entityAssetName, @@ -30,7 +31,7 @@ namespace UnityGameFramework.Runtime.AsyncTask object userData = null, float timeout = 30f) { - UniTask waitTask = AsyncTaskHelper.WaitSuccessOrFailureAsync( + UniTask waitTask = AsyncTaskHelper.WaitSuccessOrFailureAsync( ShowEntitySuccessEventArgs.EventId, ShowEntityFailureEventArgs.EventId, successArgs => successArgs.Entity.Id == entityId && ReferenceEquals(successArgs.UserData, userData), @@ -104,7 +105,7 @@ namespace UnityGameFramework.Runtime.AsyncTask /// 超时时间（秒），0表示不超时 /// 隐藏完成事件 public static UniTask HideEntityAsync(this EntityComponent entityComponent, - Entity entity, + UnityGameFramework.Runtime.Entity entity, object userData = null, float timeout = 30f) { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/LocalizationAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/LocalizationAsyncExtension.cs index c0fe1cf..adf0ace 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/LocalizationAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/LocalizationAsyncExtension.cs @@ -4,7 +4,7 @@ using GameFramework; using GameFramework.Localization; using UnityGameFramework.Runtime; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// Localization 异步扩展方法 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/NetworkAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/NetworkAsyncExtension.cs index ce5bc70..1bd0bfe 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/NetworkAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/NetworkAsyncExtension.cs @@ -1,10 +1,9 @@ -using System; using Cysharp.Threading.Tasks; -using GameFramework; -using GameFramework.Network; using UnityGameFramework.Runtime; +using NetworkClosedEventArgs = UnityGameFramework.Runtime.NetworkClosedEventArgs; +using NetworkConnectedEventArgs = UnityGameFramework.Runtime.NetworkConnectedEventArgs; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// Network 异步扩展方法 @@ -73,4 +72,4 @@ namespace UnityGameFramework.Runtime.AsyncTask ); } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ResourceAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ResourceAsyncExtension.cs index 692f13e..db0b9d2 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ResourceAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/ResourceAsyncExtension.cs @@ -1,10 +1,10 @@ -using System; using Cysharp.Threading.Tasks; -using GameFramework; -using GameFramework.Resource; using UnityGameFramework.Runtime; +using ResourceApplySuccessEventArgs = UnityGameFramework.Runtime.ResourceApplySuccessEventArgs; +using ResourceUpdateAllCompleteEventArgs = UnityGameFramework.Runtime.ResourceUpdateAllCompleteEventArgs; +using ResourceVerifySuccessEventArgs = UnityGameFramework.Runtime.ResourceVerifySuccessEventArgs; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// Resource 异步扩展方法 @@ -59,4 +59,4 @@ namespace UnityGameFramework.Runtime.AsyncTask ); } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/SceneAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/SceneAsyncExtension.cs index 9d30761..6084601 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/SceneAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/SceneAsyncExtension.cs @@ -1,10 +1,11 @@ -using System; using Cysharp.Threading.Tasks; -using GameFramework; -using GameFramework.Scene; using UnityGameFramework.Runtime; +using LoadSceneFailureEventArgs = UnityGameFramework.Runtime.LoadSceneFailureEventArgs; +using LoadSceneSuccessEventArgs = UnityGameFramework.Runtime.LoadSceneSuccessEventArgs; +using UnloadSceneFailureEventArgs = UnityGameFramework.Runtime.UnloadSceneFailureEventArgs; +using UnloadSceneSuccessEventArgs = UnityGameFramework.Runtime.UnloadSceneSuccessEventArgs; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// Scene 异步扩展方法 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/SoundAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/SoundAsyncExtension.cs index ad01109..283455e 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/SoundAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/SoundAsyncExtension.cs @@ -1,10 +1,10 @@ -using System; using Cysharp.Threading.Tasks; -using GameFramework; using GameFramework.Sound; using UnityGameFramework.Runtime; +using PlaySoundFailureEventArgs = UnityGameFramework.Runtime.PlaySoundFailureEventArgs; +using PlaySoundSuccessEventArgs = UnityGameFramework.Runtime.PlaySoundSuccessEventArgs; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// Sound 异步扩展方法 @@ -29,17 +29,17 @@ namespace UnityGameFramework.Runtime.AsyncTask float timeout = 30f) { int serialId = 0; - UniTask waitTask = AsyncTaskHelper.WaitSuccessOrFailureAsync( - PlaySoundSuccessEventArgs.EventId, - PlaySoundFailureEventArgs.EventId, - successArgs => successArgs.SerialId == serialId, - failureArgs => failureArgs.SerialId == serialId, - timeout - ); + UniTask waitTask = + AsyncTaskHelper.WaitSuccessOrFailureAsync( + PlaySoundSuccessEventArgs.EventId, + PlaySoundFailureEventArgs.EventId, + successArgs => successArgs.SerialId == serialId, + failureArgs => failureArgs.SerialId == serialId, + timeout + ); serialId = soundComponent.PlaySound(soundAssetName, soundGroupName, 0, playSoundParams, userData); return waitTask; } - } } diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/UIAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/UIAsyncExtension.cs index ee17742..735cae9 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/UIAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/UIAsyncExtension.cs @@ -3,7 +3,7 @@ using SepCore.Definition; using SepCore.UI; using UnityGameFramework.Runtime; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// UI 异步扩展方法 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/WebRequestAsyncExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/WebRequestAsyncExtension.cs index 2d06c51..1583cd8 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/WebRequestAsyncExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/AsyncTask/WebRequestAsyncExtension.cs @@ -1,10 +1,7 @@ -using System; using Cysharp.Threading.Tasks; -using GameFramework; -using GameFramework.WebRequest; using UnityGameFramework.Runtime; -namespace UnityGameFramework.Runtime.AsyncTask +namespace SepCore.AsyncTask { /// /// WebRequest 异步扩展方法 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/EntityExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/EntityExtension.cs index e936e0c..467a2dd 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/EntityExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/EntityExtension.cs @@ -1,18 +1,18 @@ using System; using System.Collections.Generic; using SepCore.Definition; -using Entity.EntityData; +using SepCore.Entity; using UnityGameFramework.Runtime; using SepCore.DataTable; -using CustomUtility; +using SepCore.CustomUtility; -namespace Entity +namespace SepCore.Entity { public static class EntityExtension { private static int s_SerialId = -10; - private const string EntityNamespace = "Entity."; + private const string EntityNamespace = "SepCore.Entity."; private static readonly Dictionary _typeDict; private static readonly Dictionary _assetNameDict; @@ -180,9 +180,9 @@ namespace Entity return assetName; } - public static int GenerateSerialId(this EntityComponent entityComponent) + public static int NextId(this EntityComponent entityComponent) { return --s_SerialId; } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization/XmlLocalizationHelper.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization/XmlLocalizationHelper.cs index 4e8fdd9..4dfcfe6 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization/XmlLocalizationHelper.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Localization/XmlLocalizationHelper.cs @@ -1,16 +1,9 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using GameFramework.Localization; +using GameFramework.Localization; using System; using System.Xml; using UnityGameFramework.Runtime; -namespace StarForce +namespace SepCore.Localization { /// /// XML 格式的本地化辅助器。 diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketBase.cs index 990c9cb..9ff91ae 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketBase.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketBase.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace StarForce +namespace SepCore.Network { public abstract class CSPacketBase : PacketBase { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketHeader.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketHeader.cs index 414430e..69d1c25 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketHeader.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/CSPacketHeader.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace StarForce +namespace SepCore.Network { public sealed class CSPacketHeader : PacketHeaderBase { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/NetworkChannelHelper.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/NetworkChannelHelper.cs index e928745..f7a3ef3 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/NetworkChannelHelper.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/NetworkChannelHelper.cs @@ -16,7 +16,7 @@ using System.IO; using System.Reflection; using UnityGameFramework.Runtime; -namespace StarForce +namespace SepCore.Network { public class NetworkChannelHelper : INetworkChannelHelper { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/CSHeartBeat.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/CSHeartBeat.cs index ee2ae33..1bce012 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/CSHeartBeat.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/CSHeartBeat.cs @@ -8,7 +8,7 @@ using ProtoBuf; using System; -namespace StarForce +namespace SepCore.Network { [Serializable, ProtoContract(Name = @"CSHeartBeat")] public class CSHeartBeat : CSPacketBase diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/SCHeartBeat.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/SCHeartBeat.cs index 00bddf6..5c31b76 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/SCHeartBeat.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/Packet/SCHeartBeat.cs @@ -8,7 +8,7 @@ using ProtoBuf; using System; -namespace StarForce +namespace SepCore.Network { [Serializable, ProtoContract(Name = @"SCHeartBeat")] public class SCHeartBeat : SCPacketBase diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketBase.cs index 0777ed8..0426271 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketBase.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketBase.cs @@ -8,7 +8,7 @@ using GameFramework.Network; using ProtoBuf; -namespace StarForce +namespace SepCore.Network { public abstract class PacketBase : Packet, IExtensible { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler/SCHeartBeatHandler.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler/SCHeartBeatHandler.cs index 0dbb069..47b1aac 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler/SCHeartBeatHandler.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandler/SCHeartBeatHandler.cs @@ -8,7 +8,7 @@ using GameFramework.Network; using UnityGameFramework.Runtime; -namespace StarForce +namespace SepCore.Network { public class SCHeartBeatHandler : PacketHandlerBase { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandlerBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandlerBase.cs index 0680067..0624782 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandlerBase.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHandlerBase.cs @@ -7,7 +7,7 @@ using GameFramework.Network; -namespace StarForce +namespace SepCore.Network { public abstract class PacketHandlerBase : IPacketHandler { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHeaderBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHeaderBase.cs index 0d985be..8e425ca 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHeaderBase.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketHeaderBase.cs @@ -8,7 +8,7 @@ using GameFramework; using GameFramework.Network; -namespace StarForce +namespace SepCore.Network { public abstract class PacketHeaderBase : IPacketHeader, IReference { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketType.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketType.cs index 2032d69..cf93d5b 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketType.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/PacketType.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace StarForce +namespace SepCore.Network { public enum PacketType : byte { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketBase.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketBase.cs index e974634..8b90f9a 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketBase.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketBase.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace StarForce +namespace SepCore.Network { public abstract class SCPacketBase : PacketBase { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketHeader.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketHeader.cs index 8cc6b36..a49448e 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketHeader.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/Network/SCPacketHeader.cs @@ -5,7 +5,7 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -namespace StarForce +namespace SepCore.Network { public sealed class SCPacketHeader : PacketHeaderBase { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/SoundExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/SoundExtension.cs index 90139ff..f26338d 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/SoundExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/SoundExtension.cs @@ -1,20 +1,13 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - +using GameFramework; using SepCore.DataTable; using SepCore.Definition; -using Entity; -using GameFramework; +using SepCore.Entity; using GameFramework.DataTable; using GameFramework.Sound; using UnityGameFramework.Runtime; -using CustomUtility; +using SepCore.CustomUtility; -namespace StarForce +namespace SepCore.Sound { public static class SoundExtension { diff --git a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/UIComponentExtension.cs b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/UIComponentExtension.cs index d26f30a..fa9d3a9 100644 --- a/Assets/GameMain/Scripts/Runtime/BuiltinComponent/UIComponentExtension.cs +++ b/Assets/GameMain/Scripts/Runtime/BuiltinComponent/UIComponentExtension.cs @@ -2,7 +2,7 @@ using GameFramework.UI; using SepCore.DataTable; using SepCore.Definition; -using CustomUtility; +using SepCore.CustomUtility; using UnityGameFramework.Runtime; namespace SepCore.UI diff --git a/Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs index 707c20e..f6f9c67 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/AbsorbComponent.cs @@ -1,9 +1,9 @@ using System; using SepCore.Definition; -using Entity; +using SepCore.Entity; using UnityEngine; -namespace Components +namespace SepCore.Components { public class AbsorbComponent : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/Components/AttackComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/AttackComponent.cs index 0e611f1..033d475 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/AttackComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/AttackComponent.cs @@ -1,10 +1,10 @@ using System.Collections; using System.Collections.Generic; -using Entity; -using Entity.Weapon; +using SepCore.Entity; +using SepCore.Entity.Weapon; using UnityEngine; -namespace Components +namespace SepCore.Components { public class AttackComponent : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs index 5c92798..299cc90 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/BackpackComponent.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using SepCore.Definition; -using Entity.Weapon; -using Entity; +using SepCore.Entity.Weapon; +using SepCore.Entity; using UnityEngine; -namespace Components +namespace SepCore.Components { public class BackpackComponent : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs index 226c8ee..e466759 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/HealthComponent.cs @@ -3,7 +3,7 @@ using SepCore.Event; using SepCore.Definition; using UnityEngine; -namespace Components +namespace SepCore.Components { public class HealthComponent : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/Components/InputComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/InputComponent.cs index a9a1a10..a2c36c3 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/InputComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/InputComponent.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Components +namespace SepCore.Components { public class InputComponent : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs index a9601e3..58cfc24 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/MovementComponent.cs @@ -1,11 +1,11 @@ using System; using SepCore.Definition; -using Entity; -using Simulation; +using SepCore.Entity; +using SepCore.Simulation; using UnityEngine; -using CustomDebugger; +using SepCore.Debugger; -namespace Components +namespace SepCore.Components { public class MovementComponent : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs b/Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs index 7397be9..361f837 100644 --- a/Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/Components/StatComponent.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using SepCore.Definition; using UnityEngine; -namespace Components +namespace SepCore.Components { public class StatComponent : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs index c866c10..b7b373c 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/BuiltinData/BuiltinDataComponent.cs @@ -1,34 +1,21 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - +using GameFramework; using SepCore.Definition; -using GameFramework; -using StarForce; -using SepCore.UI; using UnityEngine; -using UnityEngine.Serialization; using UnityGameFramework.Runtime; -namespace CustomComponent +namespace SepCore.BuiltinData { public class BuiltinDataComponent : GameFrameworkComponent { - [FormerlySerializedAs("m_BuildInfoTextAsset")] [SerializeField] - private TextAsset _buildInfoTextAsset = null; + [SerializeField] private TextAsset _buildInfoTextAsset = null; - [FormerlySerializedAs("m_DefaultDictionaryTextAsset")] [SerializeField] - private TextAsset _defaultDictionaryTextAsset = null; + [SerializeField] private TextAsset _defaultDictionaryTextAsset = null; - [FormerlySerializedAs("m_UpdateResourceFormTemplate")] [SerializeField] - private GameObject _updateResourceFormTemplate = null; + [SerializeField] private GameObject _updateResourceFormTemplate = null; - private BuildInfo m_BuildInfo = null; + private BuildInfo _buildInfo = null; - public BuildInfo BuildInfo => m_BuildInfo; + public BuildInfo BuildInfo => _buildInfo; public GameObject UpdateResourceFormTemplate => _updateResourceFormTemplate; @@ -40,8 +27,8 @@ namespace CustomComponent return; } - m_BuildInfo = Utility.Json.ToObject(_buildInfoTextAsset.text); - if (m_BuildInfo == null) + _buildInfo = Utility.Json.ToObject(_buildInfoTextAsset.text); + if (_buildInfo == null) { Log.Warning("Parse build info failure."); return; diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextComponent.cs index 84a55dc..e7cbdaf 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextComponent.cs @@ -3,7 +3,7 @@ using GameFramework.ObjectPool; using UnityEngine; using UnityGameFramework.Runtime; -namespace CustomComponent +namespace SepCore.DamageText { public class DamageTextComponent : GameFrameworkComponent { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItem.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItem.cs index 21ea3c4..2f1d08a 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItem.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItem.cs @@ -3,7 +3,7 @@ using DG.Tweening; using TMPro; using UnityEngine; -namespace CustomComponent +namespace SepCore.DamageText { public class DamageTextItem : MonoBehaviour { @@ -77,4 +77,4 @@ namespace CustomComponent _sequence = null; } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItemObject.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItemObject.cs index 3ff5800..784bd02 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItemObject.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/DamageText/DamageTextItemObject.cs @@ -2,7 +2,7 @@ using GameFramework; using GameFramework.ObjectPool; using UnityEngine; -namespace CustomComponent +namespace SepCore.DamageText { public class DamageTextItemObject : ObjectBase { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs index 0756987..602951d 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/EnemyManager/EnemyManagerComponent.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; using SepCore.DataTable; using SepCore.Definition; -using Entity; -using Entity.EntityData; +using SepCore.Entity; using GameFramework.Event; -using SepCore.Utility; +using SepCore.CustomUtility; using UnityEngine; using UnityGameFramework.Runtime; using Random = UnityEngine.Random; -namespace CustomComponent +namespace SepCore.EnemyManager { public class EnemyManagerComponent : GameFrameworkComponent { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarComponent.cs index d807966..0e7fc47 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarComponent.cs @@ -1,11 +1,10 @@ using GameFramework.ObjectPool; using System.Collections.Generic; -using Entity; -using StarForce; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace CustomComponent +namespace SepCore.HPBar { public class HPBarComponent : GameFrameworkComponent { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItem.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItem.cs index 8bc5d44..855c408 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItem.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItem.cs @@ -1,12 +1,12 @@ using System.Collections; -using Entity; +using SepCore.Entity; using SepCore.UI; using UnityEngine; using UnityEngine.Serialization; using UnityEngine.UI; using UnityGameFramework.Runtime; -namespace StarForce +namespace SepCore.HPBar { public class HPBarItem : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItemObject.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItemObject.cs index 2c95a33..25be9c5 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItemObject.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/HPBar/HPBarItemObject.cs @@ -1,15 +1,8 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using GameFramework; +using GameFramework; using GameFramework.ObjectPool; using UnityEngine; -namespace StarForce +namespace SepCore.HPBar { public class HPBarItemObject : ObjectBase { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs index a18242b..094a705 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.CollisionTransient.cs @@ -1,7 +1,7 @@ using Unity.Mathematics; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs index b899e6f..2fada99 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.EnemySeparationTemporal.cs @@ -1,6 +1,6 @@ using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs index 5dd7ac6..7c22187 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataChannel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Unity.Collections; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs index bd8e0af..222d75e 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataConversion.cs @@ -1,7 +1,7 @@ using Unity.Mathematics; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs index de6dca8..e701b45 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobDataLifecycle.cs @@ -2,7 +2,7 @@ using System; using Unity.Collections; using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs index 16bef98..887e592 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/DataChannel/SimulationWorld.JobOutputCommit.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/EntityBinding.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/EntityBinding.cs index d3c089c..d4ef749 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/EntityBinding.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/EntityBinding.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Simulation +namespace SepCore.Simulation { public sealed class EntityBinding { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionHitEventData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionHitEventData.cs index 9176817..25f18fd 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionHitEventData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionHitEventData.cs @@ -1,4 +1,4 @@ -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionRequestData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionRequestData.cs index 0e51176..8062a83 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionRequestData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/AreaCollisionRequestData.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs index 74dad2c..ff157b9 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/BuildEnemySeparationBucketsBurstJob.cs @@ -3,7 +3,7 @@ using Unity.Collections; using Unity.Jobs; using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionCandidateData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionCandidateData.cs index 6747975..5a32429 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionCandidateData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionCandidateData.cs @@ -1,4 +1,4 @@ -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionQueryData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionQueryData.cs index 75d6cd9..8e134f8 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionQueryData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/CollisionQueryData.cs @@ -1,6 +1,6 @@ using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobInputData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobInputData.cs index 5d72ecc..e3f3b37 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobInputData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobInputData.cs @@ -1,6 +1,6 @@ using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobOutputData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobOutputData.cs index e7b7a22..ead0acd 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobOutputData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyJobOutputData.cs @@ -1,6 +1,6 @@ using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyMovementBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyMovementBurstJob.cs index 51f9eb8..0f58fa9 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyMovementBurstJob.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemyMovementBurstJob.cs @@ -3,7 +3,7 @@ using Unity.Collections; using Unity.Jobs; using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemySeparationBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemySeparationBurstJob.cs index f3457b1..53b464a 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemySeparationBurstJob.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/EnemySeparationBurstJob.cs @@ -3,7 +3,7 @@ using Unity.Collections; using Unity.Jobs; using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobInputData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobInputData.cs index bd9fe86..f9b6c73 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobInputData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobInputData.cs @@ -1,6 +1,6 @@ using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobOutputData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobOutputData.cs index a1cd081..3fc5279 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobOutputData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileJobOutputData.cs @@ -1,6 +1,6 @@ using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileMovementBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileMovementBurstJob.cs index d27c6e5..002a6e8 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileMovementBurstJob.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/ProjectileMovementBurstJob.cs @@ -3,7 +3,7 @@ using Unity.Collections; using Unity.Jobs; using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs index b654f41..9cfa370 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/JobStruct/QueryCollisionCandidatesBurstJob.cs @@ -3,7 +3,7 @@ using Unity.Collections; using Unity.Jobs; using Unity.Mathematics; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs index 9803c85..3977adb 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionBroadPhase.cs @@ -1,12 +1,12 @@ -using CustomDebugger; -using Entity; +using SepCore.Debugger; +using SepCore.Entity; using Unity.Burst; using Unity.Collections; using Unity.Jobs; using Unity.Mathematics; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs index e7db405..a539de6 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPipeline.cs @@ -1,4 +1,4 @@ -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { 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 cc3ed13..5a78a7e 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionPresentation.cs @@ -1,10 +1,10 @@ using SepCore.Event; using SepCore.Definition; -using Entity; -using Entity.Weapon; +using SepCore.Entity; +using SepCore.Entity.Weapon; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionRequests.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionRequests.cs index 0e02e2e..0083840 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionRequests.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionRequests.cs @@ -1,8 +1,8 @@ -using Entity; -using Entity.Weapon; +using SepCore.Entity; +using SepCore.Entity.Weapon; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs index 74e6923..0542db5 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.CollisionResolve.cs @@ -1,11 +1,11 @@ -using Components; -using CustomDebugger; -using CustomUtility; +using SepCore.Components; +using SepCore.Debugger; +using SepCore.CustomUtility; using SepCore.Definition; -using Entity; +using SepCore.Entity; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.EnemyJobs.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.EnemyJobs.cs index 3d447f5..a396aa6 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.EnemyJobs.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.EnemyJobs.cs @@ -1,10 +1,10 @@ -using CustomDebugger; +using SepCore.Debugger; using Unity.Collections; using Unity.Jobs; using Unity.Mathematics; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs index c56b8f7..97a000c 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Jobs/SimulationWorld.ProjectileJobs.cs @@ -3,7 +3,7 @@ using Unity.Jobs; using Unity.Mathematics; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { 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 be2cd77..90768a0 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.HitPresentation.cs @@ -1,11 +1,10 @@ using SepCore.Event; -using Entity; -using Entity.EntityData; -using Entity.Weapon; +using SepCore.Entity; +using SepCore.Entity.Weapon; using GameFramework.Event; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { @@ -124,7 +123,7 @@ namespace Simulation return; } - EffectData effectData = new EffectData(entityComponent.GenerateSerialId(), effectTypeId) + EffectData effectData = new EffectData(entityComponent.NextId(), effectTypeId) { Position = args.HitPosition }; diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.Presentation.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.Presentation.cs index 34b4914..72969f1 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.Presentation.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.Presentation.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.TransformSync.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.TransformSync.cs index 308d556..472f75a 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.TransformSync.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/Presentation/SimulationWorld.TransformSync.cs @@ -1,7 +1,7 @@ -using Entity; +using SepCore.Entity; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/EnemySimData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/EnemySimData.cs index 69d2ddb..87854ce 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/EnemySimData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/EnemySimData.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public struct EnemySimData { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/PickupSimData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/PickupSimData.cs index 61dbf77..16d0cbb 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/PickupSimData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/PickupSimData.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public struct PickupSimData { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/ProjectileSimData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/ProjectileSimData.cs index a7433f8..8dc9f0a 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/ProjectileSimData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimData/ProjectileSimData.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public struct ProjectileSimData { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationTickContext.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationTickContext.cs index 2428dcd..1a2c9d0 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationTickContext.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationTickContext.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public readonly struct SimulationTickContext { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntitySync.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntitySync.cs index ef8bfde..bc156e7 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntitySync.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntitySync.cs @@ -1,8 +1,8 @@ -using Entity; +using SepCore.Entity; using GameFramework.Event; using UnityGameFramework.Runtime; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntityToSimData.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntityToSimData.cs index cbf3e8d..a80feb1 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntityToSimData.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.EntityToSimData.cs @@ -1,9 +1,8 @@ -using Components; -using Entity; -using Entity.EntityData; +using SepCore.Components; +using SepCore.Entity; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.PlayerMovement.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.PlayerMovement.cs index 467ca7b..2d05a71 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.PlayerMovement.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.PlayerMovement.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.RuntimeModules.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.RuntimeModules.cs index 00fb351..8900210 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.RuntimeModules.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.RuntimeModules.cs @@ -5,7 +5,7 @@ using Unity.Jobs; using Unity.Mathematics; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.SimEntityState.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.SimEntityState.cs index 489097a..ee62e65 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.SimEntityState.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.SimEntityState.cs @@ -1,7 +1,6 @@ -using Entity; -using Entity.EntityData; +using SepCore.Entity; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs index 23f3cf7..8b525be 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.TargetSelectionSpatialIndex.cs @@ -1,8 +1,8 @@ -using CustomDebugger; +using SepCore.Debugger; using Unity.Collections; using UnityEngine; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.cs index 6783643..33a48db 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/Simulation/SimulationWorld.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using CustomDebugger; +using SepCore.Debugger; using UnityEngine; using UnityGameFramework.Runtime; -namespace Simulation +namespace SepCore.Simulation { public sealed partial class SimulationWorld : GameFrameworkComponent { diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs index fddccf4..1e454f9 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/SpriteCache/SpriteCacheComponent.cs @@ -2,68 +2,71 @@ using System; using System.Collections.Generic; using SepCore.Definition; using GameFramework.Resource; -using CustomUtility; +using SepCore.CustomUtility; using UnityEngine; using UnityGameFramework.Runtime; -public class SpriteCacheComponent : GameFrameworkComponent +namespace SepCore.SpriteCache { - [SerializeField] private float _pixelsPerUnit = 100f; - [SerializeField] private Vector2 _defaultPivot = new(0.5f, 0.5f); - - private Dictionary _spriteCache; - private ResourceComponent _resource; - - void Start() + public class SpriteCacheComponent : GameFrameworkComponent { - _spriteCache = new Dictionary(); - _resource = GameEntry.Resource; - } + [SerializeField] private float _pixelsPerUnit = 100f; + [SerializeField] private Vector2 _defaultPivot = new(0.5f, 0.5f); - public void GetSprite(string assetName, Action callback) - { - if (_spriteCache.TryGetValue(assetName, out var sprite)) + private Dictionary _spriteCache; + private ResourceComponent _resource; + + void Start() { - callback?.Invoke(sprite); - return; + _spriteCache = new Dictionary(); + _resource = GameEntry.Resource; } - else + + public void GetSprite(string assetName, Action callback) { - _resource.LoadAsset - ( - AssetUtility.GetUITextureIconAsset(assetName), - Constant.AssetPriority.UIFormAsset, - new LoadAssetCallbacks( - (resourcePath, asset, duration, userData) => - { - Log.Debug(resourcePath); - Texture2D texture = asset as Texture2D; - if (texture != null) + if (_spriteCache.TryGetValue(assetName, out var sprite)) + { + callback?.Invoke(sprite); + return; + } + else + { + _resource.LoadAsset + ( + AssetUtility.GetUITextureIconAsset(assetName), + Constant.AssetPriority.UIFormAsset, + new LoadAssetCallbacks( + (resourcePath, asset, duration, userData) => { - Sprite newSprite = Sprite.Create( - texture, - new Rect(0, 0, texture.width, texture.height), - _defaultPivot, - _pixelsPerUnit); - _spriteCache.TryAdd(assetName, newSprite); - callback?.Invoke(newSprite); + Log.Debug(resourcePath); + Texture2D texture = asset as Texture2D; + if (texture != null) + { + Sprite newSprite = Sprite.Create( + texture, + new Rect(0, 0, texture.width, texture.height), + _defaultPivot, + _pixelsPerUnit); + _spriteCache.TryAdd(assetName, newSprite); + callback?.Invoke(newSprite); + } + }, + (resourcePath, status, errorMessage, userData) => + { + Log.Error("Can not load icon '{0}' from '{1}' with error message '{2}'.", + assetName, + resourcePath, + errorMessage); } - }, - (resourcePath, status, errorMessage, userData) => - { - Log.Error("Can not load icon '{0}' from '{1}' with error message '{2}'.", - assetName, - resourcePath, - errorMessage); - } - ) - ); + ) + ); + } + } + + private void OnDestroy() + { + _spriteCache.Clear(); + _resource = null; } } - - private void OnDestroy() - { - _spriteCache.Clear(); - _resource = null; - } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs b/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs index 7443859..7e5e47a 100644 --- a/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs +++ b/Assets/GameMain/Scripts/Runtime/CustomComponent/UIRouterComponent.cs @@ -6,7 +6,7 @@ using SepCore.UI; using UnityEngine; using UnityGameFramework.Runtime; -namespace SepCore.CustomComponent +namespace SepCore.UIRouter { public class UIRouterComponent : GameFrameworkComponent { diff --git a/Assets/GameMain/Scripts/Runtime/Debugger/ProfilerMarker.cs b/Assets/GameMain/Scripts/Runtime/Debugger/ProfilerMarker.cs index fe2c13e..d09774a 100644 --- a/Assets/GameMain/Scripts/Runtime/Debugger/ProfilerMarker.cs +++ b/Assets/GameMain/Scripts/Runtime/Debugger/ProfilerMarker.cs @@ -1,6 +1,6 @@ using Unity.Profiling; -namespace CustomDebugger +namespace SepCore.Debugger { public static class CustomProfilerMarker { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/CoinEntity.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/CoinEntity.cs index 272a98a..8ae786a 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/CoinEntity.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/CoinEntity.cs @@ -1,8 +1,8 @@ -using Entity.EntityData; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity +namespace SepCore.Entity { public class CoinEntity : EntityBase { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Effect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Effect.cs index b4266e3..fd188d3 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Effect.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Effect.cs @@ -1,16 +1,7 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using Entity; -using Entity.EntityData; -using UnityEngine; +using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity +namespace SepCore.Entity { /// /// 特效类。 diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyBase.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyBase.cs index 5cf78d1..2417f0a 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyBase.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyBase.cs @@ -1,5 +1,5 @@ using SepCore.Definition; -using Entity; +using SepCore.Entity; using UnityEngine; public abstract class EnemyBase : TargetableObject diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyProjectile.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyProjectile.cs index 4f0f701..df28e51 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyProjectile.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/EnemyProjectile.cs @@ -1,9 +1,9 @@ using SepCore.Definition; -using Entity.EntityData; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity +namespace SepCore.Entity { public class EnemyProjectile : EntityBase { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/MeleeEnemy.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/MeleeEnemy.cs index d05c656..2d44bf3 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/MeleeEnemy.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/MeleeEnemy.cs @@ -1,11 +1,11 @@ -using Components; -using CustomUtility; +using SepCore.Components; +using SepCore.CustomUtility; using SepCore.Definition; -using Entity.EntityData; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity +namespace SepCore.Entity { public class MeleeEnemy : EnemyBase { @@ -87,7 +87,7 @@ namespace Entity { if (Random.value < _meleeEnemyData.DropPercent) { - var data = new CoinData(_meleeEnemyData.DropCoin, GameEntry.Entity.GenerateSerialId(), 10001) + var data = new CoinData(_meleeEnemyData.DropCoin, GameEntry.Entity.NextId(), 10001) { Position = this.CachedTransform.position }; @@ -96,7 +96,7 @@ namespace Entity if (Random.value < _meleeEnemyData.DropPercent) { - var data = new ExpData(_meleeEnemyData.DropExp, GameEntry.Entity.GenerateSerialId(), 10002) + var data = new ExpData(_meleeEnemyData.DropExp, GameEntry.Entity.NextId(), 10002) { Position = this.CachedTransform.position }; diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/RemoteEnemy.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/RemoteEnemy.cs index c6769d9..8104de7 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/RemoteEnemy.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Enemy/RemoteEnemy.cs @@ -1,11 +1,11 @@ -using Components; -using CustomUtility; +using SepCore.Components; +using SepCore.CustomUtility; using SepCore.Definition; -using Entity.EntityData; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity +namespace SepCore.Entity { public class RemoteEnemy : EnemyBase { @@ -146,7 +146,7 @@ namespace Entity direction.Normalize(); } - int projectileEntityId = GameEntry.Entity.GenerateSerialId(); + int projectileEntityId = GameEntry.Entity.NextId(); var projectileData = new EnemyProjectileData(projectileEntityId, Id, _remoteEnemyData.Camp, _attackDamage, _projectileSpeed, _projectileLifeTime, direction) { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/EntityBase.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/EntityBase.cs index 6f14b94..1dcc733 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/EntityBase.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/EntityBase.cs @@ -1,9 +1,9 @@ -using Entity.EntityData; +using SepCore.Entity; using GameFramework; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity +namespace SepCore.Entity { public abstract class EntityBase : EntityLogic { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/ExpEntity.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/ExpEntity.cs index 1c87e98..fcf3492 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/ExpEntity.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/ExpEntity.cs @@ -1,8 +1,8 @@ -using Entity.EntityData; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity +namespace SepCore.Entity { public class ExpEntity:EntityBase { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Player.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Player.cs index d4071cf..853a793 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Player.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Player.cs @@ -1,15 +1,15 @@ using System.Collections.Generic; -using Components; +using SepCore.Components; using SepCore.Event; using SepCore.DataTable; using SepCore.Definition; -using Entity.EntityData; +using SepCore.Entity; using GameFramework.Event; using UnityGameFramework.Runtime; -using Entity.Weapon; -using SepCore.Utility; +using SepCore.Entity.Weapon; +using SepCore.CustomUtility; -namespace Entity +namespace SepCore.Entity { public class Player : TargetableObject { @@ -141,7 +141,7 @@ namespace Entity // BackpackComponent Coin = role.Coin; _backpackComponent.OnInit(this, role.WeaponCapacity); - GameEntry.Entity.ShowWeapon(EntityDataFactory.Create(GameEntry.Entity.GenerateSerialId(), + GameEntry.Entity.ShowWeapon(EntityDataFactory.Create(GameEntry.Entity.NextId(), WeaponType.WeaponKnife, Id, _playerData.Camp)); // StatComponent diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/TargetableObject.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/TargetableObject.cs index ba0be15..847e14a 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/TargetableObject.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/TargetableObject.cs @@ -5,13 +5,13 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -using Components; +using SepCore.Components; using SepCore.Definition; -using Entity.EntityData; -using CustomUtility; +using SepCore.Entity; +using SepCore.CustomUtility; using UnityEngine; -namespace Entity +namespace SepCore.Entity { /// /// 可作为目标的实体类。 diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs index 22787f8..5373c9f 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerAttackEffect.cs @@ -1,7 +1,7 @@ using GameFramework.ObjectPool; using UnityEngine; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class HandgunHitMarkerAttackEffect : IWeaponAttackEffect { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs index 57efc88..2ab237c 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPoolObject.cs @@ -2,7 +2,7 @@ using GameFramework; using GameFramework.ObjectPool; using UnityEngine; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class HandgunHitMarkerPoolObject : ObjectBase { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs index accc3a3..428b166 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/HandgunHitMarkerPooledInstance.cs @@ -1,7 +1,7 @@ using GameFramework.ObjectPool; using UnityEngine; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class HandgunHitMarkerPooledInstance : MonoBehaviour { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs index 52fedc9..645b593 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/IWeaponAttackEffect.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public interface IWeaponAttackEffect { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs index 6bb4d3d..1576d44 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/KnifeRangeAttackEffect.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class KnifeRangeAttackEffect : IWeaponAttackEffect { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs index b358215..5dbc929 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LanceThrustAttackEffect.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class LanceThrustAttackEffect : IWeaponAttackEffect { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs index f877122..7e28164 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/LightningStrikeAttackEffect.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class LightningStrikeAttackEffect : IWeaponAttackEffect { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs index af6e226..550ffc1 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/AttackEffects/SlashSectorAttackEffect.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class SlashSectorAttackEffect : IWeaponAttackEffect { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs index 2050072..ce2b2c5 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/HighestHealthTargetSelector.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Components; -using CustomUtility; +using SepCore.Components; +using SepCore.CustomUtility; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class HighestHealthTargetSelector : ITargetSelector { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs index 3b33d54..e36e505 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/ITargetSelector.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public interface ITargetSelector { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs index ced3d90..2ff496e 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/LowestHealthTargetSelector.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Components; +using SepCore.Components; using SepCore.Definition; -using CustomUtility; +using SepCore.CustomUtility; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class LowestHealthTargetSelector : ITargetSelector { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs index 1f8f080..60a0e4f 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/NearestTargetSelector.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using CustomUtility; -using CustomComponent; +using SepCore.EnemyManager; +using SepCore.CustomUtility; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public sealed class NearestTargetSelector : ITargetSelector { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs index 8e6bf92..745531a 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/TargetSelector/TargetSelectorType.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public enum TargetSelectorType { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs index 2e31515..dcefe39 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponBase.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; -using Components; +using SepCore.Components; using SepCore.Definition; -using Entity.EntityData; +using SepCore.Entity; using GameFramework; -using CustomUtility; +using SepCore.CustomUtility; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public enum WeaponStateType { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs index 30d9058..c7d1c41 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.AttackState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponHandgun { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs index 3b4eee8..8338025 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckInRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponHandgun { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs index 866e0ba..d7ee45a 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.CheckOutRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponHandgun { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs index b61dff4..4a97efb 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.IdleState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponHandgun { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs index 01449a8..f2d8672 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponHandgun/WeaponHandgun.cs @@ -1,10 +1,10 @@ using SepCore.Definition; -using Entity.EntityData; -using CustomUtility; +using SepCore.Entity; +using SepCore.CustomUtility; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponHandgun : WeaponBase { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs index fe5faf1..18faeb1 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.AttackState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponKnife { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs index e686d92..5b67e66 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckInRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponKnife { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs index a30fdf8..9abe6ac 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.CheckOutRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponKnife { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs index a2f1952..87f3f68 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.IdleState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponKnife { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs index 192c941..7330f07 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponKnife/WeaponKnife.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -using CustomUtility; +using SepCore.CustomUtility; using SepCore.Definition; using DG.Tweening; -using Entity.EntityData; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponKnife : WeaponBase { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs index 394b447..6e9109f 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.AttackState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLance { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs index 2d1d3d2..5c1e473 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckInRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLance { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs index 93bf972..38042b6 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.CheckOutRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLance { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs index f0ab6f0..8ce0d05 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.IdleState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLance { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs index ded1556..029230a 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLance/WeaponLance.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; -using Components; -using CustomUtility; +using SepCore.Components; +using SepCore.CustomUtility; using SepCore.Definition; using DG.Tweening; -using Entity.EntityData; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLance : WeaponBase { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs index 4541751..12b8dcc 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.AttackState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLightning { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs index c89e293..89cbd98 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckInRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLightning { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs index 9160ebd..f3e02a5 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.CheckOutRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLightning { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs index 1fea7a6..ce58e0e 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.IdleState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLightning { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs index fc71bda..5445d06 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponLightning/WeaponLightning.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -using CustomUtility; +using SepCore.CustomUtility; using SepCore.Definition; using DG.Tweening; -using Entity.EntityData; +using SepCore.Entity; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponLightning : WeaponBase { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs index cc8fb5a..06289aa 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.AttackState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponSlash { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs index 0b00621..43864fe 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckInRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponSlash { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs index 4b252ef..370a592 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.CheckOutRangeState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponSlash { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs index f60cc66..601ce46 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.IdleState.cs @@ -1,4 +1,4 @@ -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponSlash { diff --git a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs index ade5929..98c56da 100644 --- a/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs +++ b/Assets/GameMain/Scripts/Runtime/Entity/EntityLogic/Weapon/WeaponSlash/WeaponSlash.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using SepCore.Definition; using DG.Tweening; -using Entity.EntityData; -using CustomUtility; +using SepCore.Entity; +using SepCore.CustomUtility; using UnityEngine; using UnityGameFramework.Runtime; -namespace Entity.Weapon +namespace SepCore.Entity.Weapon { public partial class WeaponSlash : WeaponBase { diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs index 661345f..8523d64 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UGuiForm.cs @@ -1,6 +1,6 @@ using System.Collections; using System.Collections.Generic; -using StarForce; +using SepCore.Sound; using TMPro; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs index db8bbc3..920e0be 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Base/UIControllerBase.cs @@ -1,7 +1,7 @@ using Cysharp.Threading.Tasks; using SepCore.Definition; using UnityGameFramework.Runtime; -using UnityGameFramework.Runtime.AsyncTask; +using SepCore.AsyncTask; namespace SepCore.UI { diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs index eb7ccbf..141639a 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoUseCase.cs @@ -1,7 +1,7 @@ using SepCore.Definition; -using Entity; -using CustomUtility; -using Entity.Weapon; +using SepCore.Entity; +using SepCore.CustomUtility; +using SepCore.Entity.Weapon; namespace SepCore.UI { diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs index f428981..e438f1d 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/LevelUp/LevelUpUseCase.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using SepCore.DataTable; using SepCore.Definition; -using Entity; +using SepCore.Entity; using Random = UnityEngine.Random; using UnityGameFramework.Runtime; -using CustomUtility; +using SepCore.CustomUtility; using GameFramework.DataTable; namespace SepCore.UI diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs index b7e9e1e..a916002 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopRawData.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using SepCore.Definition; -using Entity.Weapon; +using SepCore.Entity.Weapon; namespace SepCore.UI { diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs index 31dc16f..b983d6e 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/ShopUseCase.cs @@ -3,11 +3,9 @@ using System.Collections.Generic; using System.Linq; using SepCore.DataTable; using SepCore.Definition; -using Entity; -using Entity.EntityData; -using CustomUtility; +using SepCore.Entity; +using SepCore.CustomUtility; using GameFramework.DataTable; -using SepCore.Utility; using UnityEngine; using UnityGameFramework.Runtime; using Random = UnityEngine.Random; @@ -283,7 +281,7 @@ namespace SepCore.UI if (goods.GoodsType == GoodsType.Prop) { - DRProp drProp = _propDataTable != null ? _propDataTable.GetDataRow(goods.GoodsTypeId) : null; + DRProp drProp = _propDataTable.GetDataRow(goods.GoodsTypeId); if (drProp == null) { Log.Warning($"ShopFormUseCase::TryGetGoodsRarity: Missing DRProp, id = {goods.GoodsTypeId}"); @@ -355,8 +353,8 @@ namespace SepCore.UI DRWeapon drWeapon = _weaponDataTable.GetDataRow(goods.GoodsTypeId); - var weaponData = EntityDataFactory.Create(GameEntry.Entity.GenerateSerialId(), drWeapon, Player.Id, - CampType.Player); + int id = GameEntry.Entity.NextId(); + var weaponData = EntityDataFactory.Create(id, drWeapon, Player.Id, CampType.Player); if (weaponData == null) { Log.Warning( @@ -379,40 +377,23 @@ namespace SepCore.UI public bool TryRecycleWeapon(int argsIndex, int argsPrice) { - Player player = Player; - if (player == null) - { - return false; - } - - var weapons = player.Weapons; - if (weapons == null || weapons.Count <= 1) + var weapons = Player.Weapons; + if (weapons.Count <= 1) { Log.Warning("ShopFormUseCase::TryRecycleWeapon: Can not recycle the last weapon."); return false; } - if (argsIndex < 0 || argsIndex >= weapons.Count) - { - Log.Warning($"ShopFormUseCase::TryRecycleWeapon: Invalid weapon index = {argsIndex}"); - return false; - } - var weapon = weapons[argsIndex]; - if (weapon == null) - { - Log.Warning("ShopFormUseCase::TryRecycleWeapon: Weapon is null."); - return false; - } int recyclePrice = Mathf.Max(0, argsPrice); - if (!player.RemoveWeapon(weapon)) + if (!Player.RemoveWeapon(weapon)) { Log.Warning("ShopFormUseCase::TryRecycleWeapon: Remove weapon failed."); return false; } - player.Coin += recyclePrice; + Player.Coin += recyclePrice; return true; } } diff --git a/Assets/GameMain/Scripts/Runtime/Utility/AIUtility.cs b/Assets/GameMain/Scripts/Runtime/Utility/AIUtility.cs index 8aa8df8..bf7302d 100644 --- a/Assets/GameMain/Scripts/Runtime/Utility/AIUtility.cs +++ b/Assets/GameMain/Scripts/Runtime/Utility/AIUtility.cs @@ -1,21 +1,14 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using System; +using System; using System.Collections.Generic; using System.Runtime.InteropServices; using SepCore.Definition; -using Entity; -using Entity.Weapon; +using SepCore.Entity; +using SepCore.Entity.Weapon; using UnityEngine; using UnityGameFramework.Runtime; using Random = UnityEngine.Random; -namespace CustomUtility +namespace SepCore.CustomUtility { /// /// AI 工具类。 diff --git a/Assets/GameMain/Scripts/Runtime/Utility/EntityDataFactory.cs b/Assets/GameMain/Scripts/Runtime/Utility/EntityDataFactory.cs index c9cc68b..9e6e6b1 100644 --- a/Assets/GameMain/Scripts/Runtime/Utility/EntityDataFactory.cs +++ b/Assets/GameMain/Scripts/Runtime/Utility/EntityDataFactory.cs @@ -1,9 +1,9 @@ using System; using SepCore.DataTable; -using Entity.EntityData; +using SepCore.Entity; using SepCore.Definition; -namespace SepCore.Utility +namespace SepCore.CustomUtility { public static class EntityDataFactory { diff --git a/Assets/Launcher.unity b/Assets/Launcher.unity index a26f698..0db9409 100644 --- a/Assets/Launcher.unity +++ b/Assets/Launcher.unity @@ -739,7 +739,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_JsonHelperTypeName - value: CustomUtility.JsonNetUtility + value: SepCore.Utility.JsonNetUtility objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Tests/Simulation/EditMode/SimulationWorldTickTests.cs b/Assets/Tests/Simulation/EditMode/SimulationWorldTickTests.cs index 2d77ba2..f9cd50a 100644 --- a/Assets/Tests/Simulation/EditMode/SimulationWorldTickTests.cs +++ b/Assets/Tests/Simulation/EditMode/SimulationWorldTickTests.cs @@ -1,9 +1,10 @@ using System.Reflection; -using Components; using NUnit.Framework; +using SepCore.Components; +using SepCore.Simulation; using UnityEngine; -namespace Simulation.Tests.Editor +namespace SepCore.Tests.Editor { public class SimulationWorldTickTests { diff --git a/Assets/Tests/Simulation/PlayMode/SimulationWorldPlayModeTests.cs b/Assets/Tests/Simulation/PlayMode/SimulationWorldPlayModeTests.cs index 84f5103..ee60d13 100644 --- a/Assets/Tests/Simulation/PlayMode/SimulationWorldPlayModeTests.cs +++ b/Assets/Tests/Simulation/PlayMode/SimulationWorldPlayModeTests.cs @@ -1,13 +1,13 @@ using System.Collections; using System.Reflection; -using Entity; -using Entity.EntityData; using SepCore.Definition; using NUnit.Framework; +using SepCore.Entity; +using SepCore.Simulation; using UnityEngine; using UnityEngine.TestTools; -namespace Simulation.Tests.PlayMode +namespace SepCore.Tests.PlayMode { public class SimulationWorldPlayModeTests {