diff --git a/Mageki/Mageki.Android/Properties/AndroidManifest.xml b/Mageki/Mageki.Android/Properties/AndroidManifest.xml index c94ed6f..b399875 100644 --- a/Mageki/Mageki.Android/Properties/AndroidManifest.xml +++ b/Mageki/Mageki.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/Mageki/Mageki.iOS/Info.plist b/Mageki/Mageki.iOS/Info.plist index ed241c7..675b426 100644 --- a/Mageki/Mageki.iOS/Info.plist +++ b/Mageki/Mageki.iOS/Info.plist @@ -26,7 +26,7 @@ CFBundleIdentifier icu.sanhei.mageki CFBundleVersion - 4 + 5 UILaunchStoryboardName LaunchScreen CFBundleName @@ -40,6 +40,6 @@ _leboremote._tcp CFBundleShortVersionString - 1.0.2 + 1.1.0 diff --git a/Mageki/Mageki/Views/ControllerPanel.cs b/Mageki/Mageki/Views/ControllerPanel.cs index acacaaf..b29c50c 100644 --- a/Mageki/Mageki/Views/ControllerPanel.cs +++ b/Mageki/Mageki/Views/ControllerPanel.cs @@ -405,10 +405,19 @@ private void TouchEffect_TouchAction(object sender, TouchActionEventArgs args) leverCache.Add((pixelLocation.X - touchPoints[args.Id].lastPosition.X, args.Id)); if (idDuplicated) { - var max = leverCache.Max((a) => MathF.Abs(a.value)); - var value = leverCache.Find(a => MathF.Abs(a.value) == max).value; - var currentValue = pixelLocation.X - touchPoints[args.Id].lastPosition.X; - MoveLever(value); + // 计算全部移动的和,并将其限制在最大与最小值之间 + var min = leverCache.Select(v => v.value).Min(); + var max = leverCache.Select(v => v.value).Max(); + var sum = leverCache.Sum(v => v.value); + if (min < 0 && sum < min) + { + sum = min; + } + if (max > 0 && sum > max) + { + sum = max; + } + MoveLever(sum); leverCache.Clear(); } } diff --git a/Mageki/Mageki/Views/SettingsPopup.xaml b/Mageki/Mageki/Views/SettingsPopup.xaml index e8124c4..f4dcc0e 100644 --- a/Mageki/Mageki/Views/SettingsPopup.xaml +++ b/Mageki/Mageki/Views/SettingsPopup.xaml @@ -34,7 +34,7 @@