From 9ade4b5ae0f4a85a57a3dfabd3aae04a082b3687 Mon Sep 17 00:00:00 2001 From: TrueZhuangjia Date: Fri, 21 Mar 2025 23:14:16 +0800 Subject: [PATCH] special game widgets: YSRB1 --- Limelight/Input/CommandManager.swift | 5 +++-- Limelight/Input/OnScreenWidgetView.swift | 4 ++-- .../LayoutOnScreenControlsViewController.m | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Limelight/Input/CommandManager.swift b/Limelight/Input/CommandManager.swift index 926bf48f..fc733d28 100644 --- a/Limelight/Input/CommandManager.swift +++ b/Limelight/Input/CommandManager.swift @@ -64,6 +64,7 @@ import UIKit @objc public static let oscButtonMappings: [String: Int32] = [ "YSRT1" : 0, // RT button & RsvPad in GenshinImpact + "YSRB1" : RB_FLAG, // RB button & RsvPad in GenshinImpact "YSB1" : B_FLAG, // B button & RsvPad in GenshinImpact "OSCA" : A_FLAG, "OSCB" : B_FLAG, @@ -95,8 +96,8 @@ import UIKit @objc public static let nonVectorStickPads: [String] = ["LSPAD", "RSPAD"] @objc public static let specialOverlayButtonCmds: [String] = ["SETTINGS"] - @objc public static let specialGameWidgets: [String] = ["YSRT1", "YSB1", "YSRT2", "YSB2", "YSEM", "YSML", "YSMR", "YSWASD"] - @objc public static let yuanshenRsvButtonCmds: [String] = ["YSRT1", "YSB1"] + @objc public static let specialGameWidgets: [String] = ["YSRT1", "YSRB1", "YSB1", "YSRT2", "YSRB2", "YSB2", "YSEM", "YSML", "YSMR", "YSWASD"] + @objc public static let yuanshenRsvButtonCmds: [String] = ["YSRT1", "YSRB1", "YSB1"] @objc public static let yuanshenMouseMoveButtonCmds: [String] = ["YSEM", "YSML", "YSMR"] static let keyboardButtonMappings: [String: Int16] = [ diff --git a/Limelight/Input/OnScreenWidgetView.swift b/Limelight/Input/OnScreenWidgetView.swift index 96e82058..b3b7af08 100644 --- a/Limelight/Input/OnScreenWidgetView.swift +++ b/Limelight/Input/OnScreenWidgetView.swift @@ -1011,7 +1011,7 @@ import UIKit updateStickIndicator() case "LSVPAD": self.sendLeftStickTouchPadEvent(inputX: deltaX*1.5167*sensitivityFactor, inputY: deltaY*1.5167*sensitivityFactor) - case "RSVPAD", "YSRT1", "YSB1": + case "RSVPAD", "YSB1", "YSRT1", "YSRB1": self.sendRightStickTouchPadEvent(inputX: deltaX*1.5167*sensitivityFactor, inputY: deltaY*1.5167*sensitivityFactor); case "DPAD", "WASDPAD", "ARROWPAD", "YSWASD": handleLrudTouchMove() @@ -1058,7 +1058,7 @@ import UIKit self.resetStickBallPositionAndRemoveIndicator() case "LSVPAD": self.onScreenControls.clearLeftStickTouchPadFlag() - case "RSVPAD","YSRT1","YSB1": + case "RSVPAD", "YSB1", "YSRT1", "YSRB1": self.onScreenControls.clearRightStickTouchPadFlag() case "WASDPAD","YSWASD": LiSendKeyboardEvent(CommandManager.keyboardButtonMappings["W"]!,Int8(KEY_ACTION_UP), 0) diff --git a/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m b/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m index 8ea6f573..52233d1d 100644 --- a/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m +++ b/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m @@ -438,7 +438,7 @@ [self.widgetAlphaSlider setValue: self->selectedWidgetView.backgroundAlpha]; [self.widgetBorderWidthSlider setValue:self->selectedWidgetView.borderWidth]; - NSSet *stickAndMouseTouchpads = [NSSet setWithObjects:@"YSB1", @"YSRT1",@"YSB2", @"YSRT2", @"YSEM", @"YSML", @"LSPAD", @"RSPAD", @"LSVPAD", @"RSVPAD", @"MOUSEPAD", nil]; + NSSet *stickAndMouseTouchpads = [NSSet setWithObjects:@"YSB1", @"YSRT1", @"YSRB1",@"YSB2", @"YSRT2", @"YSRB2", @"YSEM", @"YSML", @"YSMR", @"LSPAD", @"RSPAD", @"LSVPAD", @"RSVPAD", @"MOUSEPAD", nil]; NSSet *nonVectorStickPads = [NSSet setWithObjects: @"LSPAD", @"RSPAD", nil];