From ee945ee8d3199e91df76e7b320d2c37f5efc599a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 12 九月 2018 17:10:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/SystemSetting/ChatSetting.cs | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/System/SystemSetting/ChatSetting.cs b/System/SystemSetting/ChatSetting.cs
index bf719c3..301af13 100644
--- a/System/SystemSetting/ChatSetting.cs
+++ b/System/SystemSetting/ChatSetting.cs
@@ -112,58 +112,57 @@
public bool GetAutoPlayVoice(ChatInfoType type, int netState)
{
+ if (netState == 0)
+ {
+ return false;
+ }
switch (type)
{
case ChatInfoType.World:
- if (netState == 1)
+ if (netState == 2)
{
return GetBool(ChatBoolType.WorldVoiceWifi);
}
- else if (netState == 4)
+ else
{
return GetBool(ChatBoolType.WorldVoice4G);
}
- break;
case ChatInfoType.Area:
- if (netState == 1)
+ if (netState == 2)
{
return GetBool(ChatBoolType.AreaVoiceWifi);
}
- else if (netState == 4)
+ else
{
return GetBool(ChatBoolType.AreaVoice4G);
}
- break;
case ChatInfoType.Team:
- if (netState == 1)
+ if (netState == 2)
{
return GetBool(ChatBoolType.TeamVoiceWifi);
}
- else if (netState == 4)
+ else
{
return GetBool(ChatBoolType.TeamVoice4G);
}
- break;
case ChatInfoType.Fairy:
- if (netState == 1)
+ if (netState == 2)
{
return GetBool(ChatBoolType.GradVoiceWifi);
}
- else if (netState == 4)
+ else
{
return GetBool(ChatBoolType.GradVoice4G);
}
- break;
case ChatInfoType.Friend:
- if (netState == 1)
+ if (netState == 2)
{
return GetBool(ChatBoolType.PrivateChatVoiceWifi);
}
- else if (netState == 4)
+ else
{
return GetBool(ChatBoolType.PrivatChatVoice4G);
}
- break;
}
return false;
}
--
Gitblit v1.8.0