Test_Project_Cocos/JisolGame
1
0
Fork 0
mirror of https://gitee.com/jisol/jisol-game/ synced 2025-09-27 02:36:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
PC-20230316NUNE\Administrator
2024-10-14 20:31:57 +08:00
parent d56c133a75
commit f6c362d356
614 changed files with 16201 additions and 7420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JNFrame2/Assets/Plugins/SHFrame/Runtime/Modules/AudioModule/AudioCategory.cs
View File

@@ -86,7 +86,7 @@ namespace SHFrame
AudioAgents = new List<AudioAgent>(32);
InstanceRoot = new GameObject(Utility.Text.Format("Audio Category - {0}", _audioMixerGroup.name)).transform;
InstanceRoot.SetParent(GameModule.Audio.InstanceRoot);
InstanceRoot.SetParent(SHFrameModule.Audio.InstanceRoot);
for (int index = 0; index < _maxChannel; index++)
{
AudioAgent audioAgent = new AudioAgent();

4
JNFrame2/Assets/Plugins/SHFrame/Runtime/Modules/AudioModule/AudioModuleImp.cs
View File

@@ -343,9 +343,9 @@ namespace SHFrame
if (_instanceRoot == null)
{
_instanceRoot = new GameObject("AudioModule Instances").transform;
_instanceRoot.SetParent(GameModule.Audio.transform);
_instanceRoot.SetParent(SHFrameModule.Audio.transform);
_instanceRoot.localScale = Vector3.one;
GameModule.Audio.InstanceRoot = _instanceRoot;
SHFrameModule.Audio.InstanceRoot = _instanceRoot;
}
try

2
JNFrame2/Assets/Plugins/SHFrame/Runtime/Modules/ModuleCore/ModuleSystem.cs
View File

@@ -85,7 +85,7 @@ namespace SHFrame
}
_modules.Clear();
GameModule.Shutdown(shutdownType);
SHFrameModule.Shutdown(shutdownType);
if (shutdownType == ShutdownType.None)
{

75
JNFrame2/Assets/Plugins/SHFrame/Runtime/Modules/GameModule.cs → JNFrame2/Assets/Plugins/SHFrame/Runtime/Modules/SHFrameModule.cs
View File

@@ -7,7 +7,7 @@ namespace SHFrame
/// <summary>
/// 游戏模块。
/// </summary>
public partial class GameModule : MonoBehaviour
public partial class SHFrameModule : MonoBehaviour
{
private static readonly Dictionary<Type, Module> _moduleMaps = new Dictionary<Type, Module>(ModuleImpSystem.DesignModuleCount);
@@ -24,75 +24,25 @@ namespace SHFrame
}
private static RootModule _base;
// /// <summary>
// /// 获取调试模块。
// /// </summary>
// public static DebuggerModule Debugger
// {
// get => _debugger ??= Get<DebuggerModule>();
// private set => _debugger = value;
// }
//
//
// private static DebuggerModule _debugger;
/// <summary>
/// 获取音频模块。
/// </summary>
public static AudioModule Audio => _audio ??= Get<AudioModule>();
private static AudioModule _audio;
/// <summary>
/// 获取有限状态机模块。
/// </summary>
public static FSM.FsmModule Fsm => _fsm ??= Get<FSM.FsmModule>();
private static FSM.FsmModule _fsm;
/// <summary>
/// 流程管理模块。
/// </summary>
public static ProcedureModule Procedure => _procedure ??= Get<ProcedureModule>();
private static ProcedureModule _procedure;
/// <summary>
/// 获取对象池模块。
/// </summary>
public static ObjectPoolModule ObjectPool => _objectPool ??= Get<ObjectPoolModule>();
private static ObjectPoolModule _objectPool;
// /// <summary>
// /// 获取资源模块。
// /// </summary>
// public static ResourceModule Resource => _resource ??= Get<ResourceModule>();
//
// private static ResourceModule _resource;
/// <summary>
/// 获取音频模块。
/// </summary>
public static AudioModule Audio => _audio ??= Get<AudioModule>();
private static AudioModule _audio;
// /// <summary>
// /// 获取配置模块。
// /// </summary>
// public static SettingModule Setting => _setting ??= Get<SettingModule>();
//
// private static SettingModule _setting;
// /// <summary>
// /// 获取多语言模块。
// /// </summary>
// public static LocalizationModule Localization => _localization ??= Get<LocalizationModule>();
//
// private static LocalizationModule _localization;
// /// <summary>
// /// 获取计时器模块。
// /// </summary>
// public static TimerModule Timer => _timer ??= Get<TimerModule>();
//
// private static TimerModule _timer;
#endregion
/// <summary>
@@ -111,7 +61,6 @@ namespace SHFrame
T module = ModuleSystem.GetModule<T>();
Log.Assert(condition: module != null, $"{typeof(T)} is null");
_moduleMaps.Add(type, module);
@@ -123,7 +72,7 @@ namespace SHFrame
{
Log.Info("GameModule Active");
_gameModuleRoot = gameObject;
_gameModuleRoot.name = $"[{nameof(GameModule)}]";
_gameModuleRoot.name = $"[{nameof(SHFrameModule)}]";
DontDestroyOnLoad(_gameModuleRoot);
}
@@ -136,15 +85,9 @@ namespace SHFrame
_gameModuleRoot = null;
}
_moduleMaps.Clear();
_base = null;
// _debugger = null;
_fsm = null;
_procedure = null;
_objectPool = null;
// _resource = null;
_audio = null;
// _setting = null;
_procedure = null;
}
}
}

0
JNFrame2/Assets/Plugins/SHFrame/Runtime/Modules/GameModule.cs.meta → JNFrame2/Assets/Plugins/SHFrame/Runtime/Modules/SHFrameModule.cs.meta
View File