diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_bhxz_00013_t1_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_bhxz_00013_t1_attack_01.mp3
new file mode 100644
index 0000000000..b9b44ea8c3
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_bhxz_00013_t1_attack_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_bhxz_00013_t1_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_bhxz_00013_t1_attack_01.mp3.meta
new file mode 100644
index 0000000000..568d125d8f
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_bhxz_00013_t1_attack_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f3eab280061321543852f2b48d639c68
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dst_00023_t1_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dst_00023_t1_attack_01.mp3
new file mode 100644
index 0000000000..203788a593
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dst_00023_t1_attack_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dst_00023_t1_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dst_00023_t1_attack_01.mp3.meta
new file mode 100644
index 0000000000..c8a0b33e22
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_dst_00023_t1_attack_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 41cafea4eca21594fbf3abb0afae7384
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hhe_00011_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hhe_00011_attack_01.mp3
new file mode 100644
index 0000000000..67e6643c7e
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hhe_00011_attack_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hhe_00011_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hhe_00011_attack_01.mp3.meta
new file mode 100644
index 0000000000..30dbe540ee
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hhe_00011_attack_01.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: c1d46123f487d82448fb6eed7547a039
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_t3_attack.mp3
new file mode 100644
index 0000000000..6fdd9ee6bc
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_t3_attack.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_t3_attack.mp3.meta
new file mode 100644
index 0000000000..987d73185e
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_gyps_00020_t3_attack.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: acbe1876405bc974a820f1ab73c8effc
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_attack.mp3
new file mode 100644
index 0000000000..f5c9f954ed
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_attack.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_attack.mp3.meta
new file mode 100644
index 0000000000..32eeea4354
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_attack.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 079913704c65215468fd6af2759cabfe
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_qianyao.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_qianyao.mp3
new file mode 100644
index 0000000000..5b9c1d123e
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_qianyao.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_qianyao.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_qianyao.mp3.meta
new file mode 100644
index 0000000000..e2d42cae96
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_jbj_0007_t3_qianyao.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 5e48ab3655851814b81efcc3b855fb50
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_swk_00015_t3_qianyao.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_swk_00015_t3_qianyao.mp3
new file mode 100644
index 0000000000..45a3d5ba6a
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_swk_00015_t3_qianyao.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_swk_00015_t3_qianyao.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_swk_00015_t3_qianyao.mp3.meta
new file mode 100644
index 0000000000..11f5b480f6
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_swk_00015_t3_qianyao.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 2c7a0caa26d81254f8ceec819e9d7a35
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_t3_attack.mp3
new file mode 100644
index 0000000000..3e2dbb9ecf
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_t3_attack.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_t3_attack.mp3.meta
new file mode 100644
index 0000000000..4653bdce7d
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_ts_00017_t3_attack.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d0d1ac7b1ce896341a80ef90c89bb691
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhht_0017_skeff_slidesk_ballistic.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhht_0017_skeff_slidesk_ballistic.mp3
new file mode 100644
index 0000000000..3a3bb4b267
Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhht_0017_skeff_slidesk_ballistic.mp3 differ
diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhht_0017_skeff_slidesk_ballistic.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhht_0017_skeff_slidesk_ballistic.mp3.meta
new file mode 100644
index 0000000000..1bd90ad93c
--- /dev/null
+++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_xhht_0017_skeff_slidesk_ballistic.mp3.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d35eb78859665e349a63b1b48ed4a87a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3
index 755433d3ea..d4f797ed25 100644
Binary files a/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_Battle_01.mp3 differ
diff --git a/Assets/ManagedResources/Audio/UI/common/UI_Recruit_01.mp3 b/Assets/ManagedResources/Audio/UI/common/UI_Recruit_01.mp3
index a7f17c4ecf..9fea7c5364 100644
Binary files a/Assets/ManagedResources/Audio/UI/common/UI_Recruit_01.mp3 and b/Assets/ManagedResources/Audio/UI/common/UI_Recruit_01.mp3 differ
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index 95f4c2ac1b..516c16d725 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -98,6 +98,7 @@ function this:BindEvent()
                 LoginManager.SocketAddress = list.ip
                 LoginManager.SocketPort = list.port
                 LoginManager.ServerId = list.server_id
+                LoginManager.state = list.state
                 local severArea = tonumber(string.sub(list.server_id, 0, -5))
                 this.serverMes.text = PlayerManager.serverInfo.name .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11120]
             end
@@ -349,6 +350,7 @@ function this.SetServerList(data)
     LoginManager.SocketAddress = this.serverList[lastIndex].ip
     LoginManager.SocketPort = tonumber(this.serverList[lastIndex].port)
     LoginManager.ServerId = this.serverList[lastIndex].server_id
+    LoginManager.state = this.serverList[lastIndex].state
 
     local severArea = tonumber(string.sub(this.serverList[lastIndex].server_id, 0, -5))
     this.serverMes.text = PlayerManager.serverInfo.name .. "\t<color=#56F384FF>" .. severArea .. "</color>" .. Language[11120]
@@ -503,6 +505,10 @@ function this.ExecuteLoading()
 end
 
 function this.OnLoginClick()
+    if LoginManager.state == 0 or LoginManager.state == 1 then
+        PopupTipPanel.ShowTip(Language[11132])
+        return
+    end
     RequestPanel.Show(Language[11124])
     SocketManager.AddNetwork(SocketType.LOGIN, LoginManager.SocketAddress, LoginManager.SocketPort)
     SocketManager.TryConnect(SocketType.LOGIN)
diff --git a/data_execl/base_data/AudioConfig.xlsx b/data_execl/base_data/AudioConfig.xlsx
index 16930cd680..e512d04fbf 100644
Binary files a/data_execl/base_data/AudioConfig.xlsx and b/data_execl/base_data/AudioConfig.xlsx differ
diff --git a/data_execl/base_data/CombatControl.xlsx b/data_execl/base_data/CombatControl.xlsx
index d402151fa6..188b845686 100644
Binary files a/data_execl/base_data/CombatControl.xlsx and b/data_execl/base_data/CombatControl.xlsx differ