Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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)