|
|
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 |
|
|
|
686c52d4f7
|
修改gi
|
2025-04-07 11:42:25 +08:00 |
|
Administrator
|
7cf6b751b4
|
更新.gitlab-ci.yml文件
|
2025-04-02 06:37:11 +00:00 |
|
Administrator
|
6ca24195e8
|
更新.gitlab-ci.yml文件
|
2025-04-02 06:36:48 +00:00 |
|
Administrator
|
62a16338d7
|
更新.gitlab-ci.yml文件
|
2025-04-02 06:35:52 +00:00 |
|
Administrator
|
49b89b67e2
|
更新.gitlab-ci.yml文件
|
2025-04-02 06:35:13 +00:00 |
|
Administrator
|
ebc96e3ba3
|
更新.gitlab-ci.yml文件
|
2025-04-02 03:07:24 +00:00 |
|
Administrator
|
3f35c12e11
|
更新.gitlab-ci.yml文件
|
2025-04-02 03:06:56 +00:00 |
|
Administrator
|
7a90f3d6c7
|
更新.gitlab-ci.yml文件
|
2025-04-02 01:55:24 +00:00 |
|
Administrator
|
aa3fe383b8
|
更新.gitlab-ci.yml文件111111111111
|
2025-04-02 01:54:03 +00:00 |
|
Administrator
|
1ef099ec51
|
更新.gitlab-ci.yml文件
|
2025-04-02 01:52:40 +00:00 |
|
Administrator
|
6ef8e3284a
|
更新.gitlab-ci.yml文件
|
2025-04-02 01:50:31 +00:00 |
|
Administrator
|
0292a48347
|
更新.gitlab-ci.yml文件
|
2025-04-02 01:48:05 +00:00 |
|
Administrator
|
fd4af64e0f
|
更新.gitlab-ci.yml文件
|
2025-04-02 01:40:16 +00:00 |
|
Administrator
|
258be90114
|
更新.gitlab-ci.yml文件
|
2025-04-01 10:33:38 +00:00 |
|
Administrator
|
74821d63c0
|
更新.gitlab-ci.yml文件
|
2025-04-01 10:30:22 +00:00 |
|
Han
|
ac499e2202
|
1.01
|
2025-04-01 18:26:48 +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 |
|
|
|
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 |
|
|
|
e07d1d9721
|
修改yum
|
2025-03-31 10:29:24 +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 |
|
|
|
ab4a25a35b
|
Merge branch 'master' of http://192.168.31.100:8088/framework/xosmopluginlibrary
|
2025-03-31 10:11:12 +08:00 |
|
|
|
2234d2c52d
|
删除npm
|
2025-03-31 10:11:07 +08:00 |
|
|
|
959c8b8653
|
上传插件
|
2025-03-31 10:10:35 +08:00 |
|
Administrator
|
90d6b8a05e
|
更新.gitlab-ci.yml文件
|
2025-03-31 02:01:52 +00:00 |
|
Administrator
|
ef74b75fa8
|
更新.gitlab-ci.yml文件
|
2025-03-31 01:56:19 +00:00 |
|
Administrator
|
6d7d304ae7
|
更新.gitlab-ci.yml文件
|
2025-03-31 01:54:38 +00:00 |
|
|
|
ef6d05b29a
|
1
|
2025-03-28 18:52:09 +08:00 |
|
|
|
0f627c7070
|
1
|
2025-03-28 18:51:06 +08:00 |
|
|
|
7ede0c1512
|
测试
|
2025-03-28 18:47:41 +08:00 |
|
Administrator
|
86a417eec5
|
更新.gitlab-ci.yml文件
|
2025-03-28 10:44:35 +00:00 |
|
|
|
76b73383e5
|
跳过版本功能
|
2025-03-28 18:42:59 +08:00 |
|
|
|
b2359f07bc
|
尝试是否可以删除
|
2025-03-28 18:39:01 +08:00 |
|
Administrator
|
4786597ba6
|
更新.gitlab-ci.yml文件
|
2025-03-28 09:58:49 +00:00 |
|
Administrator
|
e3d6040537
|
更新.gitlab-ci.yml文件
|
2025-03-28 09:53:38 +00:00 |
|
Administrator
|
d8f16596ab
|
更新.gitlab-ci.yml文件
|
2025-03-28 09:52:24 +00:00 |
|