张铮
b9448ff11d
# Conflicts: # .gitlab-ci.yml # Assets/01.CodeChecker.meta # Assets/01.CodeChecker/Editor.meta # Assets/01.CodeChecker/Editor/UnityRoslyn.meta # Assets/02.InformationSave/RunTime/Abstract.meta # Assets/02.InformationSave/RunTime/Base.meta # Assets/03.FiniteStateMachine/RunTime/Abstract.meta # Assets/03.FiniteStateMachine/RunTime/Base.meta # Assets/03.FiniteStateMachine/RunTime/FiniteStateMachine.RunTime.asmdef.meta # Assets/03.FiniteStateMachine/RunTime/Use.meta # Assets/04.AudioCore/README.md # Assets/04.AudioCore/RunTime/Abstract/IAudio.cs # Assets/04.AudioCore/RunTime/Abstract/IAudio.cs.meta # Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs # Assets/04.AudioCore/RunTime/Base/AudioSourcePool.cs.meta # Assets/04.AudioCore/RunTime/Base/CoroutineHelper.cs # Assets/04.AudioCore/RunTime/Base/CoroutineHelper.cs.meta # Assets/04.AudioCore/RunTime/Base/MusicPlayer.cs # Assets/04.AudioCore/RunTime/Base/MusicPlayer.cs.meta # Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs # Assets/04.AudioCore/RunTime/Base/SFXPlayer.cs.meta # Assets/04.AudioCore/RunTime/Base/VoicePlayer.cs # Assets/04.AudioCore/RunTime/Base/VoicePlayer.cs.meta # Assets/04.AudioCore/RunTime/Use/AudioCoreManager.cs # Assets/04.AudioCore/RunTime/Use/AudioCoreManager.cs.meta # Assets/04.AudioCore/package.json # Assets/05.TableTextConversion/Editor/ConvertedExslDataMessage.cs.meta # Assets/05.TableTextConversion/Editor/EditorFrameworkUtils.cs.meta # Assets/05.TableTextConversion/Editor/Excel.meta # Assets/05.TableTextConversion/Editor/Excel/I18N.meta # Assets/05.TableTextConversion/README.md # Assets/05.TableTextConversion/RunTime/Abstract.meta # Assets/05.TableTextConversion/RunTime/Base.meta # Assets/05.TableTextConversion/RunTime/Base/AudioTableData.cs.meta # Assets/05.TableTextConversion/RunTime/Test.cs.meta # Assets/05.TableTextConversion/RunTime/Use.meta # Assets/05.TableTextConversion/package.json # Assets/Plugins.meta
13 lines
360 B
Plaintext
13 lines
360 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/05.TableTextConversion/RunTime/Base.meta
|
|
guid: f458924b47972e344ab95e73c17cec83
|
|
========
|
|
guid: 482775b04d27d6644bc8d880e135e6ac
|
|
>>>>>>>> 03.FiniteStateMachine:Assets/03.FiniteStateMachine/RunTime/Base.meta
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|