Commit 4bed95c8 authored by Games@thm's avatar Games@thm

Merge remote-tracking branch 'origin/master'

parents 195138eb 261e6574
...@@ -11,7 +11,7 @@ AudioImporter: ...@@ -11,7 +11,7 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
forceToMono: 0 forceToMono: 1
normalize: 1 normalize: 1
preloadAudioData: 1 preloadAudioData: 1
loadInBackground: 0 loadInBackground: 0
......
...@@ -11,7 +11,7 @@ AudioImporter: ...@@ -11,7 +11,7 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
forceToMono: 0 forceToMono: 1
normalize: 1 normalize: 1
preloadAudioData: 1 preloadAudioData: 1
loadInBackground: 0 loadInBackground: 0
......
...@@ -11,7 +11,7 @@ AudioImporter: ...@@ -11,7 +11,7 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
forceToMono: 0 forceToMono: 1
normalize: 1 normalize: 1
preloadAudioData: 1 preloadAudioData: 1
loadInBackground: 0 loadInBackground: 0
......
...@@ -11,7 +11,7 @@ AudioImporter: ...@@ -11,7 +11,7 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
forceToMono: 0 forceToMono: 1
normalize: 1 normalize: 1
preloadAudioData: 1 preloadAudioData: 1
loadInBackground: 0 loadInBackground: 0
......
...@@ -11,7 +11,7 @@ AudioImporter: ...@@ -11,7 +11,7 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
forceToMono: 0 forceToMono: 1
normalize: 1 normalize: 1
preloadAudioData: 1 preloadAudioData: 1
loadInBackground: 0 loadInBackground: 0
......
...@@ -11,7 +11,7 @@ AudioImporter: ...@@ -11,7 +11,7 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
forceToMono: 0 forceToMono: 1
normalize: 1 normalize: 1
preloadAudioData: 1 preloadAudioData: 1
loadInBackground: 0 loadInBackground: 0
......
fileFormatVersion: 2
guid: c29aa0de4bb26a945ae50fd6de53f7ec
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -1330,7 +1330,8 @@ PrefabInstance: ...@@ -1330,7 +1330,8 @@ PrefabInstance:
propertyPath: m_Enabled propertyPath: m_Enabled
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 4926732215222524554, guid: d63942dcf5d1a734cb4ac67d3646d06b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: d63942dcf5d1a734cb4ac67d3646d06b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: d63942dcf5d1a734cb4ac67d3646d06b, type: 3}
--- !u!1001 &5967889755714688867 --- !u!1001 &5967889755714688867
PrefabInstance: PrefabInstance:
......
...@@ -3870,7 +3870,7 @@ PrefabInstance: ...@@ -3870,7 +3870,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value: value:
objectReference: {fileID: 62794613} objectReference: {fileID: 1998148216}
- target: {fileID: 7092809741772888733, guid: d0445366486e480439baceb3cc515510, - target: {fileID: 7092809741772888733, guid: d0445366486e480439baceb3cc515510,
type: 3} type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
...@@ -6648,7 +6648,7 @@ MonoBehaviour: ...@@ -6648,7 +6648,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 870970992} m_GameObject: {fileID: 870970992}
m_Enabled: 0 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3}
m_Name: m_Name:
...@@ -13067,7 +13067,7 @@ GameObject: ...@@ -13067,7 +13067,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &1667099356 --- !u!4 &1667099356
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment