Commit Graph

198 Commits

Author SHA1 Message Date
9f9bb87821 增加06 UI框架 2025-04-10 18:15:01 +08:00
925dc0f3de 更新程序集 2025-04-10 12:10:24 +08:00
e94ecccb8b 优化日志 2025-04-10 11:57:13 +08:00
0327583687 升级版本 2025-04-10 11:47:03 +08:00
be7c63614b 修改类名 2025-04-10 11:46:42 +08:00
fac2dcf943 修改一些fsm命名 2025-04-10 11:35:40 +08:00
08b06c8ca3 修改命名 2025-04-10 11:27:16 +08:00
e3afd4acac 修改fsm 2025-04-10 11:20:22 +08:00
12f86c6eac Merge branch '00.StaryEvo' into master1
# Conflicts:
#	.gitlab-ci.yml
#	Assets/00.StaryEvo.meta
#	Assets/02.InformationSave/Editor/CustomEditorBaseEditor.cs.meta
#	Assets/02.InformationSave/RunTime/Abstract.meta
#	Assets/02.InformationSave/RunTime/Abstract/AbstractInformation.cs.meta
#	Assets/02.InformationSave/RunTime/Base.meta
#	Assets/04.AudioCore/RunTime/Abstract/IAudio.cs.meta
#	Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs.meta
#	Assets/05.TableTextConversion/RunTime/Abstract.meta
#	Assets/05.TableTextConversion/RunTime/Base.meta
#	Packages/com.code-philosophy.hybridclr/Editor.meta
#	Packages/com.code-philosophy.hybridclr/Editor/3rds/UnityHook/CodePatcher.cs.meta
#	Packages/com.code-philosophy.hybridclr/Editor/3rds/UnityHook/HookPool.cs.meta
#	Packages/com.code-philosophy.hybridclr/Editor/HybridCLR.Editor.asmdef.meta
#	Packages/com.code-philosophy.hybridclr/Runtime/HybridCLR.Runtime.asmdef.meta
2025-04-07 11:55:28 +08:00
82ad57fdcf Merge branch '02.InformationSave' into master1
# Conflicts:
#	.gitlab-ci.yml
#	Assets/01.CodeChecker.meta
#	Assets/01.CodeChecker/Editor.meta
#	Assets/01.CodeChecker/Editor/UnityRoslyn.meta
#	Assets/02.InformationSave/Editor/InformationSave.Editor.asmdef.meta
#	Assets/02.InformationSave/RunTime/InformationSave.RunTime.asmdef.meta
#	Assets/03.FiniteStateMachine/README.md
#	Assets/03.FiniteStateMachine/RunTime/Abstract/IState.cs.meta
#	Assets/03.FiniteStateMachine/RunTime/Base/FSMController.cs.meta
#	Assets/03.FiniteStateMachine/RunTime/Use/FSMInitialize.cs.meta
#	Assets/03.FiniteStateMachine/RunTime/Use/FSMManager.cs.meta
#	Assets/03.FiniteStateMachine/package.json
#	Assets/04.AudioCore/README.md
#	Assets/04.AudioCore/RunTime/Abstract/IAudio.cs
#	Assets/04.AudioCore/RunTime/Abstract/IAudio.cs.meta
#	Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs
#	Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs.meta
#	Assets/04.AudioCore/RunTime/Base/CoroutineHelper.cs
#	Assets/04.AudioCore/RunTime/Base/CoroutineHelper.cs.meta
#	Assets/04.AudioCore/RunTime/Base/MusicPlayer.cs
#	Assets/04.AudioCore/RunTime/Base/MusicPlayer.cs.meta
#	Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs
#	Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs.meta
#	Assets/04.AudioCore/RunTime/Base/VoicePlayer.cs
#	Assets/04.AudioCore/RunTime/Base/VoicePlayer.cs.meta
#	Assets/04.AudioCore/RunTime/Use/AudioCoreManager.cs
#	Assets/04.AudioCore/RunTime/Use/AudioCoreManager.cs.meta
#	Assets/04.AudioCore/package.json
#	Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs.meta
#	Assets/05.TableTextConversion/Editor/EditorFrameworkUtils.cs.meta
#	Assets/05.TableTextConversion/Editor/Excel.meta
#	Assets/05.TableTextConversion/README.md
#	Assets/05.TableTextConversion/RunTime/Abstract.meta
#	Assets/05.TableTextConversion/RunTime/Base.meta
#	Assets/05.TableTextConversion/RunTime/Test.cs.meta
#	Assets/05.TableTextConversion/RunTime/Use.meta
#	Assets/05.TableTextConversion/package.json
#	Assets/Plugins.meta
2025-04-07 11:53:03 +08:00
b9448ff11d Merge branch '03.FiniteStateMachine' into master1
# Conflicts:
#	.gitlab-ci.yml
#	Assets/01.CodeChecker.meta
#	Assets/01.CodeChecker/Editor.meta
#	Assets/01.CodeChecker/Editor/UnityRoslyn.meta
#	Assets/02.InformationSave/RunTime/Abstract.meta
#	Assets/02.InformationSave/RunTime/Base.meta
#	Assets/03.FiniteStateMachine/RunTime/Abstract.meta
#	Assets/03.FiniteStateMachine/RunTime/Base.meta
#	Assets/03.FiniteStateMachine/RunTime/FiniteStateMachine.RunTime.asmdef.meta
#	Assets/03.FiniteStateMachine/RunTime/Use.meta
#	Assets/04.AudioCore/README.md
#	Assets/04.AudioCore/RunTime/Abstract/IAudio.cs
#	Assets/04.AudioCore/RunTime/Abstract/IAudio.cs.meta
#	Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs
#	Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs.meta
#	Assets/04.AudioCore/RunTime/Base/CoroutineHelper.cs
#	Assets/04.AudioCore/RunTime/Base/CoroutineHelper.cs.meta
#	Assets/04.AudioCore/RunTime/Base/MusicPlayer.cs
#	Assets/04.AudioCore/RunTime/Base/MusicPlayer.cs.meta
#	Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs
#	Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs.meta
#	Assets/04.AudioCore/RunTime/Base/VoicePlayer.cs
#	Assets/04.AudioCore/RunTime/Base/VoicePlayer.cs.meta
#	Assets/04.AudioCore/RunTime/Use/AudioCoreManager.cs
#	Assets/04.AudioCore/RunTime/Use/AudioCoreManager.cs.meta
#	Assets/04.AudioCore/package.json
#	Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs.meta
#	Assets/05.TableTextConversion/Editor/EditorFrameworkUtils.cs.meta
#	Assets/05.TableTextConversion/Editor/Excel.meta
#	Assets/05.TableTextConversion/Editor/Excel/I18N.meta
#	Assets/05.TableTextConversion/README.md
#	Assets/05.TableTextConversion/RunTime/Abstract.meta
#	Assets/05.TableTextConversion/RunTime/Base.meta
#	Assets/05.TableTextConversion/RunTime/Base/AudioTableData.cs.meta
#	Assets/05.TableTextConversion/RunTime/Test.cs.meta
#	Assets/05.TableTextConversion/RunTime/Use.meta
#	Assets/05.TableTextConversion/package.json
#	Assets/Plugins.meta
2025-04-07 11:50:47 +08:00
3fb3e9d758 Merge branch '04.AudioCore' into master1
# Conflicts:
#	.gitlab-ci.yml
#	Assets/01.CodeChecker/Editor.meta
#	Assets/01.CodeChecker/Editor/UnityRoslyn.meta
#	Assets/02.InformationSave/RunTime/Abstract.meta
#	Assets/02.InformationSave/RunTime/Base.meta
#	Assets/04.AudioCore/RunTime/Abstract.meta
#	Assets/04.AudioCore/RunTime/AudioCore.RunTime.asmdef.meta
#	Assets/04.AudioCore/RunTime/Base.meta
#	Assets/04.AudioCore/RunTime/Use.meta
#	Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs.meta
#	Assets/05.TableTextConversion/Editor/EditorFrameworkUtils.cs.meta
#	Assets/05.TableTextConversion/Editor/Excel.meta
#	Assets/05.TableTextConversion/README.md
#	Assets/05.TableTextConversion/RunTime/Abstract.meta
#	Assets/05.TableTextConversion/RunTime/Base.meta
#	Assets/05.TableTextConversion/RunTime/Base/AudioTableData.cs.meta
#	Assets/05.TableTextConversion/RunTime/Test.cs.meta
#	Assets/05.TableTextConversion/RunTime/Use.meta
#	Assets/05.TableTextConversion/package.json
#	Assets/Plugins.meta
2025-04-07 11:48:06 +08:00
735759bef4 Merge branch '05.TableTextConversion' into master1
# Conflicts:
#	.gitlab-ci.yml
2025-04-07 11:44:30 +08:00
Han
ac499e2202 1.01 2025-04-01 18:26:48 +08:00
b089fd7240 刷新会复制代码,暂时弃用 2025-03-31 16:19:19 +08:00
718609bc33 更新json 2025-03-31 15:04:21 +08:00
1f3fb90034 报错修改 2025-03-31 15:01:11 +08:00
8d3f95ee54 迁移domite 2025-03-31 14:57:48 +08:00
c5ead42ade 更新00 2025-03-31 14:55:24 +08:00
Han
0029323f68 音频播放工具1.0.1 2025-03-31 11:49:53 +08:00
Han
0b0892545a 状态机工具1.0.1 2025-03-31 11:23:20 +08:00
613e0f7f61 修该json 2025-03-31 11:19:27 +08:00
ffcdddbd2a 框架上传 2025-03-31 11:16:52 +08:00
7197b4c0d0 测试 2025-03-31 10:59:00 +08:00
2b70f1a185 测试 2025-03-31 10:53:20 +08:00
93ca4158cb 1 2025-03-31 10:50:28 +08:00
a31059c34b 测试 2025-03-31 10:48:59 +08:00
6ca26303f1 Merge branch '02.InformationSave' of http://192.168.31.100:8088/framework/xosmopluginlibrary into 02.InformationSave
# Conflicts:
#	Assets/02.InformationSave/package.json
2025-03-31 10:45:56 +08:00
3f5dbfa267 测试02 2025-03-31 10:45:37 +08:00
Han
84760b19bb 信息配置保存工具1.0.5 2025-03-31 10:44:34 +08:00
c3e2616c3a 删除无用文件 2025-03-31 10:28:30 +08:00
bb9bb69c3a 删除无用文件 2025-03-31 10:26:25 +08:00
815435ac6f 修改json 2025-03-31 10:24:01 +08:00
24a39ccf23 删除无用文件 2025-03-31 10:20:59 +08:00
7315e4af7c 删除多余 2025-03-31 10:13:02 +08:00
2234d2c52d 删除npm 2025-03-31 10:11:07 +08:00
959c8b8653 上传插件 2025-03-31 10:10:35 +08:00
b2359f07bc 尝试是否可以删除 2025-03-28 18:39:01 +08:00
8bc049491b 更新yum 2025-03-28 16:44:26 +08:00
7c0837df33 增加npm配置 2025-03-28 13:57:37 +08:00
Administrator
6f4bca70cd 111 2025-03-27 09:09:02 +00:00
Han
0f88c0296f InformationSave_UseResources_Over 2025-03-27 16:56:33 +08:00
Han
4f6edd606d InformationSaveAndAudioCore_Over 2025-03-26 09:34:52 +08:00
Han
93531fdabf FSM_Over 2025-03-21 18:34:26 +08:00
Han
63b6601fbe 添加struct管理AudioData 2025-03-07 17:52:50 +08:00
Han
186a9da66c AudioCore0.11 2025-03-07 15:21:24 +08:00
Han
a594b6506d AudioCore0.1 2025-03-06 17:24:31 +08:00
1e49f4b547 01上传 2025-03-04 16:02:44 +08:00