Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev

# Conflicts:
#	Assets/lua/app/common/audio_manager.lua.bytes

Assets/arts/effects/texture/other/fx_b6_ui013.png.meta

@@ -128,5 +128,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: arts/textures/ui/battle.ab
+  assetBundleName: 
   assetBundleVariant: 

Assets/arts/sounds/sfx/battle/link_cancel.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/sounds/sfx/battle/link_cancel.wav.ab
   assetBundleVariant: 

Assets/arts/sounds/sfx/battle/warning_boss.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/sounds/sfx/battle/warning_boss.wav.ab
   assetBundleVariant: 

Assets/arts/sounds/sfx/ui/func_open.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/sounds/sfx/ui/func_open.wav.ab
   assetBundleVariant: 

Assets/arts/sounds/sfx/ui/hero_up.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/sounds/sfx/ui/hero_up.wav.ab
   assetBundleVariant: 

Assets/arts/sounds/sfx/ui/player_up.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/sounds/sfx/ui/player_up.wav.ab
   assetBundleVariant: 

Assets/arts/sounds/sfx/ui/reward.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/sounds/sfx/ui/reward.wav.ab
   assetBundleVariant: 

Assets/arts/sounds/sfx/ui/summon_start.wav.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/sounds/sfx/ui/summon_start.wav.ab
   assetBundleVariant: 

Assets/arts/sounds/sfx/ui/ui_hero_lv_up.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 4b8a22b6615f7684cad8aa910f1f35a3
-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: 

Assets/arts/sounds/sfx/ui/ui_player_lv_up.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 1637462340bfaf74ebd7de6472d95813
-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: 

Assets/arts/sounds/sfx/ui/ui_reward_get.wav.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: b01ce51b215b53244bbb9f41110dcef8
-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: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2.atlas.txt.meta

@@ -3,5 +3,5 @@ guid: 4629a8e1e37aff54fb52f32d7a1f1b20
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2.png.meta

@@ -116,5 +116,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2.skel.bytes.meta

@@ -3,5 +3,5 @@ guid: f2a8ed3dd340f6845a6e8e9d5f7b6c04
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2_atlas.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2_material.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
   assetBundleVariant: 

Assets/arts/spines/ui/ui_battle_result_2/ui_battle_result_2_skeletondata.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/ui/ui_battle_result_2.ab
   assetBundleVariant: