|
|
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 |
|
