Assets/00.StaryEvo.meta

fileFormatVersion: 2
<<<<<<<< HEAD:Assets/05.TableTextConversion/RunTime/Base.meta
guid: f458924b47972e344ab95e73c17cec83
========
guid: c96ccfb3a14425d4e81a3d31ba25bede
>>>>>>>> 00.StaryEvo:Assets/00.StaryEvo.meta
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant:
01上传 2025-03-04 16:02:44 +08:00			`fileFormatVersion: 2`
Merge branch '00.StaryEvo' into master1 # Conflicts: # .gitlab-ci.yml # Assets/00.StaryEvo.meta # Assets/02.InformationSave/Editor/CustomEditorBaseEditor.cs.meta # Assets/02.InformationSave/RunTime/Abstract.meta # Assets/02.InformationSave/RunTime/Abstract/AbstractInformation.cs.meta # Assets/02.InformationSave/RunTime/Base.meta # Assets/04.AudioCore/RunTime/Abstract/IAudio.cs.meta # Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs.meta # Assets/05.TableTextConversion/RunTime/Abstract.meta # Assets/05.TableTextConversion/RunTime/Base.meta # Packages/com.code-philosophy.hybridclr/Editor.meta # Packages/com.code-philosophy.hybridclr/Editor/3rds/UnityHook/CodePatcher.cs.meta # Packages/com.code-philosophy.hybridclr/Editor/3rds/UnityHook/HookPool.cs.meta # Packages/com.code-philosophy.hybridclr/Editor/HybridCLR.Editor.asmdef.meta # Packages/com.code-philosophy.hybridclr/Runtime/HybridCLR.Runtime.asmdef.meta 2025-04-07 11:55:28 +08:00			`<<<<<<<< HEAD:Assets/05.TableTextConversion/RunTime/Base.meta`
			`guid: f458924b47972e344ab95e73c17cec83`
			`========`
框架上传 2025-03-31 11:16:52 +08:00			`guid: c96ccfb3a14425d4e81a3d31ba25bede`
Merge branch '00.StaryEvo' into master1 # Conflicts: # .gitlab-ci.yml # Assets/00.StaryEvo.meta # Assets/02.InformationSave/Editor/CustomEditorBaseEditor.cs.meta # Assets/02.InformationSave/RunTime/Abstract.meta # Assets/02.InformationSave/RunTime/Abstract/AbstractInformation.cs.meta # Assets/02.InformationSave/RunTime/Base.meta # Assets/04.AudioCore/RunTime/Abstract/IAudio.cs.meta # Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs.meta # Assets/05.TableTextConversion/RunTime/Abstract.meta # Assets/05.TableTextConversion/RunTime/Base.meta # Packages/com.code-philosophy.hybridclr/Editor.meta # Packages/com.code-philosophy.hybridclr/Editor/3rds/UnityHook/CodePatcher.cs.meta # Packages/com.code-philosophy.hybridclr/Editor/3rds/UnityHook/HookPool.cs.meta # Packages/com.code-philosophy.hybridclr/Editor/HybridCLR.Editor.asmdef.meta # Packages/com.code-philosophy.hybridclr/Runtime/HybridCLR.Runtime.asmdef.meta 2025-04-07 11:55:28 +08:00			`>>>>>>>> 00.StaryEvo:Assets/00.StaryEvo.meta`
01上传 2025-03-04 16:02:44 +08:00			`folderAsset: yes`
			`DefaultImporter:`
			`externalObjects: {}`
			`userData:`
			`assetBundleName:`
			`assetBundleVariant:`