Assets/Plugins.meta

fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Plugins.meta
guid: 65c18d699fcadad459bc3e16558c2bd2
========
guid: 4ffae49923bf0d34e9da8ee451f962f8
>>>>>>>> 04.AudioCore:Assets/04.AudioCore/RunTime/Use.meta
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant:
01上传 2025-03-04 16:02:44 +08:00			`fileFormatVersion: 2`
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			`<<<<<<<< HEAD:Assets/Plugins.meta`
删除无用文件 2025-03-31 10:28:30 +08:00			`guid: 65c18d699fcadad459bc3e16558c2bd2`
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			`========`
			`guid: 4ffae49923bf0d34e9da8ee451f962f8`
			`>>>>>>>> 04.AudioCore:Assets/04.AudioCore/RunTime/Use.meta`
01上传 2025-03-04 16:02:44 +08:00			`folderAsset: yes`
			`DefaultImporter:`
			`externalObjects: {}`
			`userData:`
			`assetBundleName:`
			`assetBundleVariant:`