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

Merge branch '00.StaryEvo' into master1

Browse Source 
# 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
parent 82ad57fdcf 8a8774b5ee
commit 12f86c6eac
552 changed files with 29469 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/00.StaryEvo.meta Normal file
View File

@@ -0,0 +1,12 @@
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: