diff --git a/Locales/ja.qm b/Locales/ja.qm index 71431fb..fd5d786 100644 Binary files a/Locales/ja.qm and b/Locales/ja.qm differ diff --git a/Locales/zh.qm b/Locales/zh.qm index c28beec..f7054dc 100644 Binary files a/Locales/zh.qm and b/Locales/zh.qm differ diff --git a/Locales/zh_TW.qm b/Locales/zh_TW.qm index 98a973c..65d3d8c 100644 Binary files a/Locales/zh_TW.qm and b/Locales/zh_TW.qm differ diff --git a/bin/ADVServer.exe b/bin/ADVServer.exe index 5370740..405b9f3 100644 Binary files a/bin/ADVServer.exe and b/bin/ADVServer.exe differ diff --git a/package.json b/package.json index f12c798..94bb220 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "top.mashiros.widget.advp", - "version": "1.4.1", + "version": "1.4.3", "title": { "en": "ADV Plugin", diff --git a/qml/Common.qml b/qml/Common.qml index 2b47692..aa3da8c 100644 --- a/qml/Common.qml +++ b/qml/Common.qml @@ -22,6 +22,9 @@ Item { "peakthr": 10, "fps": 35, "changespeed": 20 + }, + "advanced": { + "device_reboot": false } } readonly property string iniFile: "../bin/advConfig.ini" diff --git a/qml/ServerPreferences.qml b/qml/ServerPreferences.qml index fe1932c..35c0b6d 100644 --- a/qml/ServerPreferences.qml +++ b/qml/ServerPreferences.qml @@ -207,6 +207,20 @@ NVG.Window { } } + P.PreferenceGroup { + Layout.fillWidth: true + name: "advanced" + Heading { text: qsTr("Advanced") } + + P.SwitchPreference { + name: "device_reboot" + label: qsTr("Reboot on Device Changed") + message: qsTr("Problems caused by switching devices may be resolved.") + warning: value ? qsTr("The recovery time of the animation when switching devices may increase!") : "" + defaultValue: Common.defaultServerCFG["advanced"]["device_reboot"] + } + } + Component.onCompleted: { rootPreference.load(Common.serverCFG) } diff --git a/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml b/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml index 320c490..83eb0a9 100644 --- a/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml +++ b/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml @@ -8,7 +8,6 @@ AdvpStyleTemplate { readonly property var audioData: new Array(128) //configs - readonly property int fps: configs["Refresh Rate"] readonly property real timer_interval: 1000/configs["Refresh Rate"] readonly property real bassAmRatio: configs["Bass AM"]/100 readonly property real altoAmRatio: configs["Alto AM"]/100 @@ -22,7 +21,7 @@ AdvpStyleTemplate { readonly property real halfWidth: width/2 readonly property real rHeight: 0.6*height - readonly property real speed: configs["Speed"]/100 + readonly property real speed: 0.3*configs["Speed"]/configs["Refresh Rate"] readonly property real _MAX: (height/2)-4 readonly property real _noise: configs["Static AM"]/100*_MAX readonly property real _delta: _MAX-_noise @@ -109,7 +108,7 @@ AdvpStyleTemplate { altoAm = altoAm / 19.2; bassAm = bassAm / 6.4; - _phase = (_phase+speed*(30 / fps))%(Math.PI*64); + _phase = (_phase+speed)%(Math.PI*64); context.clearRect(0, 0, width+32, height+32);