diff --git a/Assets/Framework/Tool/AudioManager.cs b/Assets/Framework/Tool/AudioManager.cs index b8ed661c2..33031b252 100644 --- a/Assets/Framework/Tool/AudioManager.cs +++ b/Assets/Framework/Tool/AudioManager.cs @@ -35,10 +35,10 @@ public class AudioManager : MonoSingleton } float value = PlayerPrefs.GetFloat("slider_AudioBG"); - audioMixer.SetFloat("BGVolume", value * 100 - 80); + audioMixer.SetFloat("BGVolume", 20.0f * Mathf.Log10(Mathf.Max(value, 0.0001f))); value = PlayerPrefs.GetFloat("slider_FX"); - audioMixer.SetFloat("FXVolume", value*100-80); + audioMixer.SetFloat("FXVolume", 20.0f * Mathf.Log10(Mathf.Max(value, 0.0001f))); dic_audioList[AudioType.BG].outputAudioMixerGroup = audioMixer.FindMatchingGroups("Master/BG")[0]; dic_audioList[AudioType.FX].outputAudioMixerGroup = audioMixer.FindMatchingGroups("Master/FX")[0]; } diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs index 619ea2638..7ec07f3d0 100644 --- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs +++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs @@ -75,5 +75,10 @@ namespace Assets.MyGame.Scripts.Net.API /// 击杀配置 /// public object killConfig; + + /// + /// 象棋配置 + /// + public ChessConfig chessConfig; } } \ No newline at end of file diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs new file mode 100644 index 000000000..35e4b162d --- /dev/null +++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; + +namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass +{ + /// + /// 象棋配置 + /// + [Serializable] + public class ChessConfig + { + /// 创建房间限制 1 vip 2 代理商 3 普通用户 + public List createRoomLimit; + + /// 最小投注金币 + public long minBetGold; + + /// 投注金币限制列表 + public List betGoldLimits; + } +} diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs.meta new file mode 100644 index 000000000..3d8060451 --- /dev/null +++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 04679bca9a39c8c4084ea5fa0864533b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab index f02cc4d35..34bd1bdbf 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/2.5SelectCoin.prefab @@ -1771,6 +1771,13 @@ MonoBehaviour: tmp_CurrGlod: {fileID: 6468753285455309694} tmpInput_Coin: {fileID: 3126247594640834412} btn_Enter: {fileID: 2826394579243728725} + jinerList: + - {fileID: 4399664319064742888} + - {fileID: 6199326318943480037} + - {fileID: 4044324667058174783} + - {fileID: 6902807486243113198} + - {fileID: 2194459829576141627} + - {fileID: 4356994284705232430} --- !u!1 &4002775877117272818 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs index 789a8c053..580e8df85 100644 --- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs +++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessSetCoin.cs @@ -11,7 +11,7 @@ public class UIChineseChessSetCoin : SubUIBase public TextMeshProUGUI tmp_CurrGlod; public TMP_InputField tmpInput_Coin; public Button btn_Enter; - public List