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
This commit is contained in:
2025-04-07 11:55:28 +08:00
552 changed files with 29469 additions and 19 deletions

View File

@@ -0,0 +1,15 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/04.AudioCore/RunTime/Abstract/IAudio.cs.meta
guid: a45ad70b96df7ae428058f547876d158
========
guid: 97cc0d26f72fc4148b8370b2252d1585
>>>>>>>> 00.StaryEvo:Packages/com.code-philosophy.hybridclr/Editor/3rds/UnityHook/CodePatcher.cs.meta
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: