张铮
12f86c6eac
# 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
16 lines
461 B
Plaintext
16 lines
461 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs.meta
|
|
guid: b0879cbfda12f434f97c3e393664b7ec
|
|
========
|
|
guid: 6b7421e47f0ae1e4ebb72bf18d1d7d48
|
|
>>>>>>>> 00.StaryEvo:Packages/com.code-philosophy.hybridclr/Editor/3rds/UnityHook/HookPool.cs.meta
|
|
MonoImporter:
|
|
externalObjects: {}
|
|
serializedVersion: 2
|
|
defaultReferences: []
|
|
executionOrder: 0
|
|
icon: {instanceID: 0}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|