Merge branch 'master_develop' into master_test

dev_chengFeng
JieLing 2020-07-17 17:00:55 +08:00
commit 29fc6f99eb
8 changed files with 49 additions and 6 deletions

View File

@ -0,0 +1,43 @@
fileFormatVersion: 2
guid: ffeef6d315af54a489f986b57a64fea6
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides:
1:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
4:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
7:
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6864,7 +6864,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2911701139505363764
RectTransform:
m_ObjectHideFlags: 0
@ -13129,7 +13129,7 @@ ParticleSystem:
--- !u!199 &1083645269967354099
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19940,7 +19940,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 270, y: -872}
m_AnchoredPosition: {x: 0, y: -872}
m_SizeDelta: {x: 295.63, y: 84.151}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3648998059851915409
@ -26251,7 +26251,7 @@ ParticleSystem:
--- !u!199 &8451515492985319499
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -32511,7 +32511,7 @@ ParticleSystem:
--- !u!199 &6598447891554960103
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -43665,7 +43665,7 @@ ParticleSystem:
--- !u!199 &5882379970318000206
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

Binary file not shown.

Binary file not shown.