root/plugin-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '02.InformationSave' into master1

Browse Source 
# 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
This commit is contained in:
张铮
2025-04-07 11:53:03 +08:00
parent b9448ff11d 49b89b67e2
commit 82ad57fdcf
7 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/02.InformationSave/Editor/InformationSave.Editor.asmdef.meta Normal file
View File

@@ -0,0 +1,13 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/05.TableTextConversion/RunTime/Abstract.meta
guid: 3f4958b2707b1874fb59e045842881b7
folderAsset: yes
DefaultImporter:
========
guid: 31bb7766059e37c42b8898e180dc877f
AssemblyDefinitionImporter:
>>>>>>>> 02.InformationSave:Assets/02.InformationSave/Editor/InformationSave.Editor.asmdef.meta
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: