Merge branch 'dev_hero' into dev_hero_2
This commit is contained in:
commit
c0d9bde0e3
BIN
Assets/arts/sounds/sfx/battle/10016001.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10016001.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10016001.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10016001.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a1d8887dd859cc54585b7c9ab57144ee
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10016002.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10016002.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10016002.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10016002.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b826daa1025d1d348be87b6bebbf4d35
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10016003.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10016003.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10016003.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10016003.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e6c8b2259610de44bad027bc3e4ae91f
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10017001.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10017001.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10017001.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10017001.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 985d5e09912ad9f43a69c3332406298a
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10017002.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10017002.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10017002.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10017002.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 897aaeb8f7179274c82beb82c898bb2e
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10017003.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10017003.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10017003.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10017003.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f7a32951a668ccd4db6c4e2b7fca75ec
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10018001.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10018001.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10018001.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10018001.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 645c162c1d8c92640a78b5361373fb43
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10018002.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10018002.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10018002.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10018002.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d62f96915dd20494d93e935f4e692c5f
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10018003.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10018003.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10018003.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10018003.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8eb7d8bfbbdabe249894c98cf8212c05
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10019001.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10019001.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10019001.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10019001.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9011dc829c995534981a7dd239b5b156
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10019002.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10019002.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10019002.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10019002.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 815bbe14c5eea0344b5ebeeb597b8ac3
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/10019003.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/10019003.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/10019003.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/10019003.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: afdb02dcdda929443bf28ebe89b0cd97
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user