[TouchController] 拆分仅视角移动模式

Author: fifth-light

touchcontroller/common/config/data/StatusConfig.kt

@@ -8,7 +8,8 @@ data class StatusConfig(
 ) {
     enum class Status {
         DISABLED,
-        ONLY_VIEW,
+        ONLY_VIEW_CLICK_TO_INTERACT,
+        ONLY_VIEW_AIMING_BY_CROSSHAIR,
         ENABLED,
     }
 }

touchcontroller/common/event/render/RenderEvents.kt

@@ -166,7 +166,13 @@ object RenderEvents {
 
         val preset = when (config.status.status) {
             StatusConfig.Status.ENABLED -> GlobalConfigHolder.currentPreset.value
-            StatusConfig.Status.ONLY_VIEW, StatusConfig.Status.DISABLED -> LayoutPreset()
+            StatusConfig.Status.ONLY_VIEW_CLICK_TO_INTERACT, StatusConfig.Status.DISABLED -> LayoutPreset()
+            StatusConfig.Status.ONLY_VIEW_AIMING_BY_CROSSHAIR -> LayoutPreset(
+                controlInfo = PresetControlInfo(
+                    splitControls = true,
+                    disableCrosshair = false,
+                )
+            )
         }
         val currentPresetUuid = GlobalConfigHolder.currentPresetUuid.value
         if (ControllerHudModel.status.previousPresetUuid != currentPresetUuid) {
@@ -255,6 +261,9 @@ object RenderEvents {
 
     fun shouldRenderCrosshair(): Boolean {
         val config = GlobalConfigHolder.config.value
+        if (config.status.status == StatusConfig.Status.ONLY_VIEW_AIMING_BY_CROSSHAIR) {
+            return true
+        }
         val preset = GlobalConfigHolder.currentPreset.value
         if (!preset.controlInfo.disableCrosshair) {
             return true

touchcontroller/common/ui/config/tab/status/StatusTab.kt

@@ -113,11 +113,20 @@ object StatusTab : Tab() {
                 )
                 StatusItem(
                     modifier = Modifier.fillMaxWidth(),
-                    title = Text.translatable(Texts.SCREEN_CONFIG_STATUS_STATUS_ONLY_VIEW_TITLE),
-                    description = Text.translatable(Texts.SCREEN_CONFIG_STATUS_STATUS_ONLY_VIEW_DESCRIPTION),
-                    selected = screenState.config.status.status == StatusConfig.Status.ONLY_VIEW,
+                    title = Text.translatable(Texts.SCREEN_CONFIG_STATUS_STATUS_ONLY_VIEW_CLICK_TO_INTERACT_TITLE),
+                    description = Text.translatable(Texts.SCREEN_CONFIG_STATUS_STATUS_ONLY_VIEW_CLICK_TO_INTERACT_DESCRIPTION),
+                    selected = screenState.config.status.status == StatusConfig.Status.ONLY_VIEW_CLICK_TO_INTERACT,
                     onClick = {
-                        screenModel.updateConfig { copy(status = status.copy(status = StatusConfig.Status.ONLY_VIEW)) }
+                        screenModel.updateConfig { copy(status = status.copy(status = StatusConfig.Status.ONLY_VIEW_CLICK_TO_INTERACT)) }
+                    }
+                )
+                StatusItem(
+                    modifier = Modifier.fillMaxWidth(),
+                    title = Text.translatable(Texts.SCREEN_CONFIG_STATUS_STATUS_ONLY_VIEW_AIMING_BY_CROSSHAIR_TITLE),
+                    description = Text.translatable(Texts.SCREEN_CONFIG_STATUS_STATUS_ONLY_VIEW_AIMING_BY_CROSSHAIR_DESCRIPTION),
+                    selected = screenState.config.status.status == StatusConfig.Status.ONLY_VIEW_AIMING_BY_CROSSHAIR,
+                    onClick = {
+                        screenModel.updateConfig { copy(status = status.copy(status = StatusConfig.Status.ONLY_VIEW_AIMING_BY_CROSSHAIR)) }
                     }
                 )
                 StatusItem(

touchcontroller/resources/lang/en_us.json

@@ -58,9 +58,11 @@
   "touchcontroller.screen.config.status.status.title": "Status",
   "touchcontroller.screen.config.status.status.enable.title": "Enable",
   "touchcontroller.screen.config.status.status.enable.description": "Enable all of TouchController's functionalities.",
-  "touchcontroller.screen.config.status.status.only_view.title": "Only view movement",
-  "touchcontroller.screen.config.status.status.only_view.description": "Disable TouchController's layers and widgets. You can only turning view with touch.",
-  "touchcontroller.screen.config.status.status.disable.title": "Disabled",
+  "touchcontroller.screen.config.status.status.only_view.click_to_interact.title": "Only view - click to interact",
+  "touchcontroller.screen.config.status.status.only_view.click_to_interact.description": "Disable TouchController's layers and widgets. Only use touch ring is enabled.",
+  "touchcontroller.screen.config.status.status.only_view.aiming_by_crosshair.title": "Only view - aiming by crosshair",
+  "touchcontroller.screen.config.status.status.only_view.aiming_by_crosshair.description": "Disable TouchController's layers and widgets. Only interacting with crosshair is enabled.",
+  "touchcontroller.screen.config.status.status.disable.title": "Disable",
   "touchcontroller.screen.config.status.status.disable.description": "Disable all of TouchController's functionalities.",
 
   "touchcontroller.screen.config.platform.title": "Platform",

touchcontroller/resources/lang/ru_ru.json

@@ -66,6 +66,8 @@
 
 
 
+
+
 
 
 

touchcontroller/resources/lang/uk_ua.json

@@ -66,6 +66,8 @@
 
 
 
+
+
 
 
 

touchcontroller/resources/lang/zh_cn.json

@@ -58,8 +58,10 @@
   "touchcontroller.screen.config.status.status.title": "状态",
   "touchcontroller.screen.config.status.status.enable.title": "启用",
   "touchcontroller.screen.config.status.status.enable.description": "启用 TouchController 的全部功能。",
-  "touchcontroller.screen.config.status.status.only_view.title": "仅视角移动",
-  "touchcontroller.screen.config.status.status.only_view.description": "禁用 TouchController 的图层、控件功能。你只能使用触控移动视角。",
+  "touchcontroller.screen.config.status.status.only_view.click_to_interact.title": "仅视角移动 - 点击屏幕交互",
+  "touchcontroller.screen.config.status.status.only_view.click_to_interact.description": "禁用 TouchController 的图层、控件功能。你只能使用触控圈。",
+  "touchcontroller.screen.config.status.status.only_view.aiming_by_crosshair.title": "仅视角移动 - 使用准心瞄准",
+  "touchcontroller.screen.config.status.status.only_view.aiming_by_crosshair.description": "禁用 TouchController 的图层、控件功能。你只能使用准心瞄准。",
   "touchcontroller.screen.config.status.status.disable.title": "禁用",
   "touchcontroller.screen.config.status.status.disable.description": "禁用 TouchController 的全部功能。",
 

touchcontroller/resources/lang/zh_tw.json

@@ -66,6 +66,8 @@
 
 
 
+
+