张铮 12f86c6eac 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

327 B

Raw Blame History

View Raw