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