diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index f5ecb5af974d8d5e65aa06668d9d25bd17af0d74..421fdd3dd1b558163c25543e88032dad8f1c7391 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -9873,11 +9873,6 @@ PrefabInstance:
propertyPath: cursor
value:
objectReference: {fileID: 9064903938289346084}
- - target: {fileID: 8113570465842942721, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- propertyPath: m_ControlPath
- value: <AndroidGamepad>/leftStick/right
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3}
--- !u!224 &251852623843673080 stripped
diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
index f9dbafec665c390e351884b383f785215a988609..537799868b7ec9191872f0eca75141b1a192c0be 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
@@ -85,7 +85,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &4536182054360666613
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1063,6 +1063,7 @@ GameObject:
- component: {fileID: 3857477823993388403}
- component: {fileID: 8504146597865748088}
- component: {fileID: 3096886616148442080}
+ - component: {fileID: 6899621963745804817}
m_Layer: 5
m_Name: lookDown_Bttn
m_TagString: Untagged
@@ -1191,6 +1192,19 @@ MonoBehaviour:
returnToCentreSpeed: 3
DPAD_ID: 1
DPAD_subID: 1
+--- !u!114 &6899621963745804817
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 869470752977909503}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ControlPath: <Keyboard>/numpad2
--- !u!1 &981731503631153796
GameObject:
m_ObjectHideFlags: 0
@@ -5896,6 +5910,7 @@ MonoBehaviour:
modload: mod+load
cancel_keyBind:
MathM_keyBind:
+ waitingBetweenInputs: 0.2
CamControl_StdAsset: {fileID: 0}
CamControl_ScriptChar: {fileID: 0}
LockOnly: 0
@@ -5921,6 +5936,7 @@ MonoBehaviour:
toolMode_keyBind: ToolmMenue
MathMode_keyBind: MathMenue
cancel_keyBind: Cancel
+ waitingBetweenInputs: 0.2
CamControl_StdAsset: {fileID: 0}
CamControl_ScriptChar: {fileID: 0}
LockOnly: 0
@@ -6746,7 +6762,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_ControlPath: <AndroidGamepad>/leftStick/left
+ m_ControlPath: <Keyboard>/a
--- !u!1 &5758162535022508935
GameObject:
m_ObjectHideFlags: 0
@@ -6839,6 +6855,7 @@ GameObject:
- component: {fileID: 5862698845745050722}
- component: {fileID: 3660793625693083670}
- component: {fileID: 6146784258860444841}
+ - component: {fileID: 5427755148148390559}
m_Layer: 5
m_Name: lookRight_Bttn
m_TagString: Untagged
@@ -6967,6 +6984,19 @@ MonoBehaviour:
returnToCentreSpeed: 3
DPAD_ID: 1
DPAD_subID: 3
+--- !u!114 &5427755148148390559
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5860753462651737002}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ControlPath: <Keyboard>/numpad6
--- !u!1 &5864357338153736736
GameObject:
m_ObjectHideFlags: 0
@@ -9383,6 +9413,7 @@ GameObject:
- component: {fileID: 8349960202201848670}
- component: {fileID: 3587524361807733467}
- component: {fileID: 8331219707896444696}
+ - component: {fileID: 1460111558209134463}
m_Layer: 5
m_Name: lookUp_Bttn
m_TagString: Untagged
@@ -9511,6 +9542,19 @@ MonoBehaviour:
returnToCentreSpeed: 3
DPAD_ID: 1
DPAD_subID: 0
+--- !u!114 &1460111558209134463
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7657229146870105675}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ControlPath: <Keyboard>/numpad8
--- !u!1 &7696601924612351785
GameObject:
m_ObjectHideFlags: 0
@@ -10190,6 +10234,7 @@ GameObject:
- component: {fileID: 6492321266462464089}
- component: {fileID: 8519280086974111293}
- component: {fileID: 5678269206069650979}
+ - component: {fileID: 8259380370967580861}
m_Layer: 5
m_Name: lookLeft_Bttn
m_TagString: Untagged
@@ -10318,6 +10363,19 @@ MonoBehaviour:
returnToCentreSpeed: 3
DPAD_ID: 1
DPAD_subID: 2
+--- !u!114 &8259380370967580861
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8077718219709762565}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ControlPath: <Keyboard>/numpad4
--- !u!1 &8080377498543777938
GameObject:
m_ObjectHideFlags: 0
@@ -11008,7 +11066,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_ControlPath: <AndroidGamepad>/leftStick/down
+ m_ControlPath: <Keyboard>/s
--- !u!1 &8646849091251002183
GameObject:
m_ObjectHideFlags: 0
@@ -11359,7 +11417,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_ControlPath: <AndroidGamepad>/leftStick/up
+ m_ControlPath: <Keyboard>/w
--- !u!1 &8680886438502677496
GameObject:
m_ObjectHideFlags: 0
@@ -12013,7 +12071,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6d54531977ecb194c95e2d3aa7a5d72a, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_ControlPath: <Gamepad>/leftStick/right
+ m_ControlPath: <Keyboard>/d
--- !u!1 &9160427781974945230
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..db4d0c946fb201cace07210366beb906535c50b3
--- /dev/null
+++ b/Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab
@@ -0,0 +1,128 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2464893811460590176
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2685535731263505864}
+ - component: {fileID: 4562596043252269475}
+ - component: {fileID: 501930733893895563}
+ - component: {fileID: 6763975020389587129}
+ - component: {fileID: 5414632706773564122}
+ m_Layer: 5
+ m_Name: EventSystem_Ctrl
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2685535731263505864
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2464893811460590176}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!114 &4562596043252269475
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2464893811460590176}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f69cd23b5313c8c40824873afc4336c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ StandaloneInputModule_script: {fileID: 5414632706773564122}
+ InputSystem_script: {fileID: 6763975020389587129}
+--- !u!114 &501930733893895563
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2464893811460590176}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 10
+--- !u!114 &6763975020389587129
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2464893811460590176}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_MoveRepeatDelay: 0.5
+ m_MoveRepeatRate: 0.1
+ m_XRTrackingOrigin: {fileID: 0}
+ m_ActionsAsset: {fileID: -944628639613478452, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_PointAction: {fileID: 2787269754930072312, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_MoveAction: {fileID: -8000054911219160802, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_SubmitAction: {fileID: -1164850180647287051, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_CancelAction: {fileID: 5021183070679051413, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_LeftClickAction: {fileID: -2905359092256336139, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_MiddleClickAction: {fileID: -6457457704027189829, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_RightClickAction: {fileID: -4720735822871017716, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_ScrollWheelAction: {fileID: 1961103683205594085, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_TrackedDevicePositionAction: {fileID: 3025511880077461582, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_TrackedDeviceOrientationAction: {fileID: 3420696649144862720, guid: c67c429830e750846928f3ce8ff01c52,
+ type: 3}
+ m_DeselectOnBackgroundClick: 1
+ m_PointerBehavior: 0
+--- !u!114 &5414632706773564122
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2464893811460590176}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e47d83588826f3e6dac1ca6b5ac6c77e6e6fc8b7
--- /dev/null
+++ b/Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f95a31fc6dbf0c04fba0fcf2bb48b74e
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menues/LaunchMenue.unity
index 9f2f3594313e2110e557b28356dcb5e17f44ceb7..f6a046cc77ec1bc18cbbb7a34aeeda40be4bb535 100644
--- a/Assets/Scenes/Menues/LaunchMenue.unity
+++ b/Assets/Scenes/Menues/LaunchMenue.unity
@@ -355,7 +355,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -907,152 +907,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 2731443630378168978}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1604326196
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1604326199}
- - component: {fileID: 1604326198}
- - component: {fileID: 1604326197}
- - component: {fileID: 1604326200}
- - component: {fileID: 1604326201}
- m_Layer: 0
- m_Name: EventSystem
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1604326197
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1604326196}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MoveRepeatDelay: 0.5
- m_MoveRepeatRate: 0.1
- m_XRTrackingOrigin: {fileID: 0}
- m_ActionsAsset: {fileID: -944628639613478452, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_PointAction: {fileID: 2787269754930072312, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_MoveAction: {fileID: -8000054911219160802, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_SubmitAction: {fileID: -1164850180647287051, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_CancelAction: {fileID: 5021183070679051413, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_LeftClickAction: {fileID: -2905359092256336139, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_MiddleClickAction: {fileID: -6457457704027189829, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_RightClickAction: {fileID: -4720735822871017716, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_ScrollWheelAction: {fileID: 1961103683205594085, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_TrackedDevicePositionAction: {fileID: 3025511880077461582, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_TrackedDeviceOrientationAction: {fileID: 3420696649144862720, guid: c67c429830e750846928f3ce8ff01c52,
- type: 3}
- m_DeselectOnBackgroundClick: 1
- m_PointerBehavior: 0
---- !u!114 &1604326198
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1604326196}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_FirstSelected: {fileID: 0}
- m_sendNavigationEvents: 1
- m_DragThreshold: 10
---- !u!4 &1604326199
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1604326196}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1604326200
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1604326196}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalAxis: Horizontal
- m_VerticalAxis: Vertical
- m_SubmitButton: Submit
- m_CancelButton: Cancel
- m_InputActionsPerSecond: 10
- m_RepeatDelay: 0.5
- m_ForceModuleActive: 0
---- !u!114 &1604326201
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1604326196}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MoveRepeatDelay: 0.5
- m_MoveRepeatRate: 0.1
- m_XRTrackingOrigin: {fileID: 0}
- m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_DeselectOnBackgroundClick: 1
- m_PointerBehavior: 0
--- !u!1 &1690169163
GameObject:
m_ObjectHideFlags: 0
@@ -1146,7 +1000,7 @@ RectTransform:
m_Children:
- {fileID: 807395038}
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2313,3 +2167,132 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d55296411d4f39e43804eb54bbc798fc, type: 3}
+--- !u!1001 &8065997490532208083
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 2464893811460590176, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Name
+ value: EventSystem_Ctrl
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6244158373242493342, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8065997489519288039, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e, type: 3}
diff --git a/Assets/Scenes/Menues/MainMenue.unity b/Assets/Scenes/Menues/MainMenue.unity
index 97bcdae22a514f712358f8ec8d9408330eeb81e6..e38d6a52f9710ee2fe69a825ed710f099a795980 100644
--- a/Assets/Scenes/Menues/MainMenue.unity
+++ b/Assets/Scenes/Menues/MainMenue.unity
@@ -1651,7 +1651,7 @@ RectTransform:
- {fileID: 1715382525}
- {fileID: 1461957320}
m_Father: {fileID: 748839400}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -15406,7 +15406,6 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1670311904}
- - {fileID: 1509924335}
- {fileID: 795387529}
- {fileID: 1122481475}
- {fileID: 104678357}
@@ -15917,7 +15916,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 748839400}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -20536,7 +20535,7 @@ RectTransform:
- {fileID: 1113073886}
- {fileID: 1409078451}
m_Father: {fileID: 748839400}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -25247,111 +25246,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1479868004}
m_CullTransparentMesh: 1
---- !u!1 &1509924334
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1509924335}
- - component: {fileID: 1509924337}
- - component: {fileID: 1509924338}
- - component: {fileID: 1509924336}
- m_Layer: 0
- m_Name: EventSystem
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1509924335
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1509924334}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -620, y: -378.5, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 748839400}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1509924336
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1509924334}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalAxis: Horizontal
- m_VerticalAxis: Vertical
- m_SubmitButton: Submit
- m_CancelButton: Cancel
- m_InputActionsPerSecond: 10
- m_RepeatDelay: 0.5
- m_ForceModuleActive: 0
---- !u!114 &1509924337
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1509924334}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_FirstSelected: {fileID: 0}
- m_sendNavigationEvents: 1
- m_DragThreshold: 10
---- !u!114 &1509924338
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1509924334}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_MoveRepeatDelay: 0.5
- m_MoveRepeatRate: 0.1
- m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018,
- type: 3}
- m_DeselectOnBackgroundClick: 1
- m_PointerBehavior: 0
--- !u!1001 &1518615279
PrefabInstance:
m_ObjectHideFlags: 0
@@ -33736,6 +33630,125 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &1947765208
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 2464893811460590176, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Name
+ value: EventSystem_Ctrl
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e, type: 3}
--- !u!1 &1948762627
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index 3e9a5d35a92c1a869c51ac25f3d8369de4e96bf0..20db0256a79d4492fd33d24d198eda0c58ff3936 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -11989,7 +11989,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!114 &424784666
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -11997,7 +11997,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 424784665}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name:
@@ -12065,7 +12065,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 424784665}
- m_Enabled: 0
+ m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
@@ -26263,6 +26263,125 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1172319188}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1177795121
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 2464893811460590176, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Name
+ value: EventSystem_Ctrl
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e, type: 3}
--- !u!1001 &1179177042
PrefabInstance:
m_ObjectHideFlags: 0
@@ -39584,7 +39703,7 @@ PrefabInstance:
- target: {fileID: 56657870313274395, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 176107170605012170, guid: caf448c160a07214f8cf74da91506980,
type: 3}
@@ -39594,7 +39713,7 @@ PrefabInstance:
- target: {fileID: 379535290971861935, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 781083353825694746, guid: caf448c160a07214f8cf74da91506980,
type: 3}
@@ -39659,7 +39778,7 @@ PrefabInstance:
- target: {fileID: 3125883343003143675, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3348170081564112110, guid: caf448c160a07214f8cf74da91506980,
type: 3}
@@ -39839,7 +39958,7 @@ PrefabInstance:
- target: {fileID: 6275790083704784081, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6322013052525978475, guid: caf448c160a07214f8cf74da91506980,
type: 3}
@@ -39849,7 +39968,7 @@ PrefabInstance:
- target: {fileID: 6652188390175341001, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_Enabled
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6655507811741835331, guid: caf448c160a07214f8cf74da91506980,
type: 3}
@@ -39879,7 +39998,7 @@ PrefabInstance:
- target: {fileID: 6965102678323893764, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7216169563200149950, guid: caf448c160a07214f8cf74da91506980,
type: 3}
@@ -58357,11 +58476,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 799731411169533317, guid: b07552db700124a4680401e6fb94c186,
- type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 1306529574817530029, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -58547,11 +58661,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2760891898245757436, guid: b07552db700124a4680401e6fb94c186,
- type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 2804693203643534396, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
@@ -58905,7 +59014,7 @@ PrefabInstance:
- target: {fileID: 3021233186536587618, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3030200741558213723, guid: b07552db700124a4680401e6fb94c186,
type: 3}
@@ -59137,11 +59246,6 @@ PrefabInstance:
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- - target: {fileID: 3518642511282427553, guid: b07552db700124a4680401e6fb94c186,
- type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 3557603187153135309, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -59250,7 +59354,7 @@ PrefabInstance:
- target: {fileID: 4812433399655966640, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Enabled
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4911573750081415578, guid: b07552db700124a4680401e6fb94c186,
type: 3}
@@ -59275,7 +59379,7 @@ PrefabInstance:
- target: {fileID: 5183107850734844792, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5271626897556190298, guid: b07552db700124a4680401e6fb94c186,
type: 3}
@@ -59357,11 +59461,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5759121280688682652, guid: b07552db700124a4680401e6fb94c186,
- type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 5762901222101511535, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -59385,22 +59484,22 @@ PrefabInstance:
- target: {fileID: 5906074623694190304, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.w
- value: 0.7837364
+ value: 0.78373635
objectReference: {fileID: 0}
- target: {fileID: 5906074623694190304, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0.6210936
+ value: 0.62109363
objectReference: {fileID: 0}
- target: {fileID: 5906074623694190304, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0.00000001685798
+ value: 0.00000003371315
objectReference: {fileID: 0}
- target: {fileID: 5906074623694190304, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.z
- value: -0.0000000133600455
+ value: -0.000000026716922
objectReference: {fileID: 0}
- target: {fileID: 5927928908429282872, guid: b07552db700124a4680401e6fb94c186,
type: 3}
@@ -59657,6 +59756,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 7017378599863151949, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7084517198453429193, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Name
@@ -59682,30 +59786,40 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7269088014366733546, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 7.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7269088014366733546, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -18
+ objectReference: {fileID: 0}
- target: {fileID: 7269088014366733546, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.w
- value: -0.9859738
+ value: 0.98410004
objectReference: {fileID: 0}
- target: {fileID: 7269088014366733546, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.x
- value: -0.16690041
+ value: 0.1776151
objectReference: {fileID: 0}
- target: {fileID: 7269088014366733546, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0.000000052809167
+ value: -0.00000002268545
objectReference: {fileID: 0}
- target: {fileID: 7269088014366733546, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.z
- value: -0.000000041845645
+ value: 0.000000024216396
objectReference: {fileID: 0}
- target: {fileID: 7299826999578007368, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: default_value
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7364148210846522891, guid: b07552db700124a4680401e6fb94c186,
type: 3}
@@ -59850,7 +59964,7 @@ PrefabInstance:
- target: {fileID: 8149887571177692625, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8180161551596881868, guid: b07552db700124a4680401e6fb94c186,
type: 3}
diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
index 10b06b829158fa110321af2c3d82c3c0c4afeccb..73057abc9882e4c7b91df6afaf69350ffe423a0b 100644
--- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
+++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
@@ -58,13 +58,13 @@ private void Awake()
//New InputSystem
input_ControlMapping = new ControlMapping();
input_ControlMapping.Actionmap1.Movement.Enable();
- input_ControlMapping.Actionmap1.LookCamera.Enable();
- //input_ControlMapping.Actionmap1.Movement.
+ input_ControlMapping.Actnmp_HC.Movement.Enable();
+
}
private void OnEnable()
{
input_ControlMapping.Actionmap1.Movement.Enable();
- input_ControlMapping.Actionmap1.LookCamera.Enable();
+ input_ControlMapping.Actnmp_HC.Movement.Enable();
//NPC1.setPlayer(gameObject);
}
@@ -72,7 +72,8 @@ private void OnEnable()
private void OnDisable()
{
input_ControlMapping.Actionmap1.Movement.Disable();
- input_ControlMapping.Actionmap1.LookCamera.Disable();
+ input_ControlMapping.Actnmp_HC.Movement.Disable();
+
}
// Use this for initialization
@@ -279,12 +280,19 @@ private void GetInput(out float speed)
}
if (UIconfig.InputManagerVersion == 2)
{
- Vector2 a = input_ControlMapping.Actionmap1.Movement.ReadValue<Vector2>();
- //Vector2 a = input_ControlMapping.Actionmap1.LookCamera.ReadValue<Vector2>();
- //input_ControlMapping.Actionmap1.Movement.
+ Vector2 a;
+ if (CommunicationEvents.Opsys == 1)
+ {
+ a = input_ControlMapping.Actnmp_HC.Movement.ReadValue<Vector2>();
+ }
+ else
+ {
+ a = input_ControlMapping.Actionmap1.Movement.ReadValue<Vector2>();
+ }
+
m_Input = a;
- //print("mvp");
+
}
if (UIconfig.InputManagerVersion == 3)
diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
index 8925194da7c40da33f2182360f6a19c8e12eb8ee..864b5242c94e2c3e136b1b0d24c60a64383e8ea1 100644
--- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
+++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
@@ -31,8 +31,20 @@ public void Init(Transform character, Transform camera)
m_CameraTargetRot = camera.localRotation;
input_ControlMapping = new ControlMapping();
input_ControlMapping.Actionmap1.LookCamera.Enable();
- //input_ControlMapping.Actionmap1.MouseX.Enable();
- //input_ControlMapping.Actionmap1.MouseY.Enable();
+ input_ControlMapping.Actnmp_HC.LookCamera.Enable();
+ }
+ private void OnEnable()
+ {
+ input_ControlMapping.Actionmap1.LookCamera.Enable();
+ input_ControlMapping.Actnmp_HC.LookCamera.Enable();
+ //NPC1.setPlayer(gameObject);
+ }
+
+ private void OnDisable()
+ {
+ input_ControlMapping.Actionmap1.LookCamera.Disable();
+ input_ControlMapping.Actnmp_HC.LookCamera.Disable();
+
}
@@ -59,10 +71,24 @@ public void LookRotation(Transform character, Transform camera)
}
if (UIconfig.InputManagerVersion == 2)
{
- Vector2 a = input_ControlMapping.Actionmap1.LookCamera.ReadValue<Vector2>();
- yRot = a.x * XSensitivity * 0.1f ;
- xRot = a.y * YSensitivity * 0.1f;
+ Vector2 a;
+ if (CommunicationEvents.Opsys == 1)
+ {
+ a = input_ControlMapping.Actnmp_HC.LookCamera.ReadValue<Vector2>();
+ a.Normalize();
+
+ }
+ else
+ {
+ a = input_ControlMapping.Actionmap1.LookCamera.ReadValue<Vector2>();
+ a.Normalize();
+
+
+ }
+
+ yRot = a.x * XSensitivity;
+ xRot = a.y * YSensitivity;
//xRot = XSensitivity * input_ControlMapping.Actionmap1.MouseX.ReadValue<float>();
diff --git a/Assets/Scripts/UI/InGame/EventsystemMode_Ctrl.cs b/Assets/Scripts/UI/InGame/EventsystemMode_Ctrl.cs
new file mode 100644
index 0000000000000000000000000000000000000000..4cd5cb7ebe4c9f201857396eed327abfb7695462
--- /dev/null
+++ b/Assets/Scripts/UI/InGame/EventsystemMode_Ctrl.cs
@@ -0,0 +1,112 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.SceneManagement;
+using System.IO;
+using UnityEngine.Video;//streaming
+using UnityEngine.Networking;
+//using static StreamingAssetLoader;
+//using static CheckServer;
+//using static CommunicationEvents;
+using static UIconfig;
+using UnityEngine.EventSystems;
+using UnityEngine.InputSystem.UI;
+
+public class EventsystemMode_Ctrl : MonoBehaviour
+{
+
+ //public GameObject myself_GObj;
+ //public GameObject StandaloneInputModule_GObj;
+ //public GameObject InputSystem_GObj;
+ public StandaloneInputModule StandaloneInputModule_script;
+ public InputSystemUIInputModule InputSystem_script;
+
+ private int GpMode_before=-99;
+
+
+
+
+ void Start()
+ {
+
+ Update2();
+
+
+ }
+
+ private void Update()
+ {
+
+ if (GpMode_before!= UIconfig.InputManagerVersion)
+ {
+ Update2();
+ EventSystemModule = InputManagerVersion;
+
+ }
+ if (GpMode_before != UIconfig.EventSystemModule)
+ {
+ Update2();
+
+ }
+
+ }
+
+ private void Update2(){
+
+
+ //Todo Eventbased
+ //ClearUIC();
+ switch (UIconfig.EventSystemModule)
+ {
+ case 0:
+ break;
+ case 1:
+
+ //StandaloneInputModule_script.ActivateModule();
+ //InputSystem_script.DeactivateModule();
+
+ gameObject.GetComponent<StandaloneInputModule>().enabled=true;
+ gameObject.GetComponent<InputSystemUIInputModule>().enabled = false;
+
+
+ break;
+ case 2:
+ //InputSystem_script.ActivateModule();
+ //StandaloneInputModule_script.DeactivateModule();
+
+ gameObject.GetComponent<StandaloneInputModule>().enabled = false;
+ gameObject.GetComponent<InputSystemUIInputModule>().enabled = true;
+ break;
+ case 3:
+
+ gameObject.GetComponent<StandaloneInputModule>().enabled = false;
+ gameObject.GetComponent<InputSystemUIInputModule>().enabled = true;
+ break;
+
+ default:
+ gameObject.GetComponent<StandaloneInputModule>().enabled = false;
+ gameObject.GetComponent<InputSystemUIInputModule>().enabled = true;
+ break;
+ }
+ GpMode_before = UIconfig.GameplayMode;
+
+ }
+
+
+ /*
+ /// <summary>
+ /// Deactivates all Pages.
+ /// </summary>
+ private void ClearUIC()
+ {
+
+ for (int i = 0; i < myself_GObj.transform.childCount; i++)
+ {
+ myself_GObj.transform.GetChild(i).gameObject.SetActive(false);
+ }
+ }
+ */
+
+
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/InGame/EventsystemMode_Ctrl.cs.meta b/Assets/Scripts/UI/InGame/EventsystemMode_Ctrl.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c0bce5ea63c65fc1814964310e7b92db39ccca1e
--- /dev/null
+++ b/Assets/Scripts/UI/InGame/EventsystemMode_Ctrl.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f69cd23b5313c8c40824873afc4336c2
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs b/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs
index 40687df9d9bd6c480c9b727ee069d2ccd8b7aa36..2b03251f5317c30bf8831d6758f71fab5b1dfc11 100644
--- a/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs
+++ b/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs
@@ -15,9 +15,8 @@
public class MainPlayerMode_Ctrl : MonoBehaviour
{
-
//public TaskCharakterAnimation NPC1;
-
+
//public int myUI_ID;
public GameObject myself_GObj;
//public GameObject parent_GObj;
@@ -32,7 +31,7 @@ public class MainPlayerMode_Ctrl : MonoBehaviour
public GameObject Escaperoom_GObj;
public GameObject Sidescroller_GObj;
- private int GpMode_before=-99;
+ private int GpMode_before = -99;
diff --git a/Assets/Scripts/UI/PlayerControls/ControlMapping.cs b/Assets/Scripts/UI/PlayerControls/ControlMapping.cs
index e9b65d41aba0676b4031a35cbe6de772a99c2042..e66161b59df6d93ad4fef5e4c1f2cb4d1c2d3ddd 100644
--- a/Assets/Scripts/UI/PlayerControls/ControlMapping.cs
+++ b/Assets/Scripts/UI/PlayerControls/ControlMapping.cs
@@ -320,6 +320,61 @@ public @ControlMapping()
""isComposite"": false,
""isPartOfComposite"": true
},
+ {
+ ""name"": ""2D Vector"",
+ ""id"": ""4d4f3df3-0f42-4ed0-8c68-96dfe3967cce"",
+ ""path"": ""2DVector"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Movement"",
+ ""isComposite"": true,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": ""up"",
+ ""id"": ""1603a694-00a7-4077-b427-30b2c201b2b4"",
+ ""path"": ""<Gamepad>/leftStick/up"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""Movement"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""down"",
+ ""id"": ""d67b9667-baad-44df-a7bc-5fc5dadf677d"",
+ ""path"": ""<Gamepad>/leftStick/down"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""Movement"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""left"",
+ ""id"": ""322909e9-974e-41ab-86b8-0ebe2f17b81e"",
+ ""path"": ""<AndroidGamepad>/leftStick/left"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""Movement"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""right"",
+ ""id"": ""daf8bd19-cb0b-40ad-ac35-fb4f15a28b9f"",
+ ""path"": ""<Gamepad>/leftStick/right"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Gamepad;Android;KeyboardMouse;Keyboard;test"",
+ ""action"": ""Movement"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
{
""name"": """",
""id"": ""74b23070-b002-405d-880f-612ed4af5d02"",
@@ -587,32 +642,140 @@ public @ControlMapping()
]
},
{
- ""name"": ""Actnmp_HC_Bttn"",
- ""id"": ""c5d06d07-2701-43c0-b3d3-64f20b18c93e"",
+ ""name"": ""Actnmp_HC"",
+ ""id"": ""3be62548-8d95-4444-a948-f9b29ce6663c"",
""actions"": [
{
""name"": ""Movement"",
- ""type"": ""Value"",
- ""id"": ""96b5cec0-5b2c-40af-9187-aa9025e85924"",
+ ""type"": ""PassThrough"",
+ ""id"": ""73d6fe4c-b811-4cd8-98e3-a48838c02866"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """",
- ""initialStateCheck"": true
+ ""initialStateCheck"": false
},
{
""name"": ""LookCamera"",
- ""type"": ""Value"",
- ""id"": ""ba69a09b-82ef-41b4-ada5-68abbd4497eb"",
+ ""type"": ""PassThrough"",
+ ""id"": ""b908e0f5-fd90-49c6-98d2-68259eb64102"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": true
+ },
+ {
+ ""name"": ""Fire1 or Mouse left"",
+ ""type"": ""Button"",
+ ""id"": ""32eb87eb-71fe-47ed-a2b0-625f3e15984f"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Camerazoom"",
+ ""type"": ""Button"",
+ ""id"": ""c6b285ee-9764-4bb5-8058-484846b168dc"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Cancel"",
+ ""type"": ""Button"",
+ ""id"": ""2520ff6f-1d3a-4bcc-8ba4-58d44f13b48b"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""ToolMode"",
+ ""type"": ""Button"",
+ ""id"": ""05854e86-61c3-49a4-bd16-10078394f422"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""MathMode"",
+ ""type"": ""Button"",
+ ""id"": ""1d0224c6-318d-4e32-9121-600fa1ed6433"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Talking"",
+ ""type"": ""Button"",
+ ""id"": ""2ca6f6fc-da4a-4e0e-9c88-fd38c218720f"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Modifier"",
+ ""type"": ""Button"",
+ ""id"": ""ace47207-3137-4639-9bc4-3abad8891b2e"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Load"",
+ ""type"": ""Button"",
+ ""id"": ""df491415-c02f-45dc-8c84-65dbbebc51dc"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Save"",
+ ""type"": ""Button"",
+ ""id"": ""7bd29b49-00f1-4197-88df-bcc229c91c3e"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Reset"",
+ ""type"": ""Button"",
+ ""id"": ""447bffd7-7d75-4774-85de-605377c7e00e"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Undo"",
+ ""type"": ""Button"",
+ ""id"": ""808a2930-227a-4e6b-a1d2-87382d9471c3"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Redo"",
+ ""type"": ""Button"",
+ ""id"": ""6e3aafb9-1986-41b1-a2ec-8a2c819e9fef"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
}
],
""bindings"": [
{
- ""name"": ""2D Vector"",
- ""id"": ""6a4f2c07-cad2-4a2d-9e91-7903b76475bf"",
+ ""name"": ""2D Vector _2"",
+ ""id"": ""b0536072-086c-4637-96cc-81242942834d"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
@@ -623,51 +786,51 @@ public @ControlMapping()
},
{
""name"": ""up"",
- ""id"": ""ba0d317c-b756-42f0-b3db-052fc72aa17b"",
- ""path"": ""<Keyboard>/numpad8"",
+ ""id"": ""7b6a695c-298f-4154-bbe8-135a863d3413"",
+ ""path"": ""<Keyboard>/w"",
""interactions"": """",
""processors"": """",
- ""groups"": """",
+ ""groups"": ""KeyboardMouse;Keyboard;test;Android;Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
- ""id"": ""6b778def-7a6a-4a72-b2c3-0970c201d2f1"",
- ""path"": ""<Keyboard>/numpad5"",
+ ""id"": ""e68dd331-d7ad-4289-9f8e-70e73c0e8904"",
+ ""path"": ""<Keyboard>/s"",
""interactions"": """",
""processors"": """",
- ""groups"": """",
+ ""groups"": ""KeyboardMouse;Keyboard;test;Android;Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
- ""id"": ""8f515e82-ac82-4e37-ab89-1f7cdb8f9ffc"",
- ""path"": ""<Keyboard>/numpad4"",
+ ""id"": ""1b47c1f7-c2f0-4d21-b113-0979196f4de1"",
+ ""path"": ""<Keyboard>/a"",
""interactions"": """",
""processors"": """",
- ""groups"": """",
+ ""groups"": ""KeyboardMouse;Keyboard;Gamepad;Android;test"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
- ""id"": ""2fc809bb-8391-46b2-9044-3acc5410fb8c"",
- ""path"": ""<Keyboard>/numpad6"",
+ ""id"": ""808510ba-5d75-421b-a1f0-f3e714fdb612"",
+ ""path"": ""<Keyboard>/d"",
""interactions"": """",
""processors"": """",
- ""groups"": """",
+ ""groups"": ""KeyboardMouse;Keyboard;Gamepad;Android;test"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
- ""name"": ""2D Vector _2"",
- ""id"": ""139f0316-2182-4790-b325-26fdab97a763"",
+ ""name"": ""2D Vector"",
+ ""id"": ""8a745d1e-af1b-4a19-831e-14013fcbe9bd"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
@@ -678,8 +841,8 @@ public @ControlMapping()
},
{
""name"": ""up"",
- ""id"": ""31fdda8e-7547-42b7-8d76-3519c726a994"",
- ""path"": ""<Keyboard>/w"",
+ ""id"": ""a72541d3-c138-486b-8cc4-42731aa31b76"",
+ ""path"": ""<Gamepad>/leftStick/up"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
@@ -689,8 +852,8 @@ public @ControlMapping()
},
{
""name"": ""down"",
- ""id"": ""17673297-b36e-47a5-9759-a21c782fcd46"",
- ""path"": ""<Keyboard>/s"",
+ ""id"": ""2077fce0-c086-49c5-a7d3-f823164c457a"",
+ ""path"": ""<Gamepad>/leftStick/down"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
@@ -700,8 +863,8 @@ public @ControlMapping()
},
{
""name"": ""left"",
- ""id"": ""9afd8031-3a04-44d3-9b4b-2f5649ee0a8d"",
- ""path"": ""<Keyboard>/a"",
+ ""id"": ""4a36e1ed-5df3-4912-9bd8-4f110958f5c7"",
+ ""path"": ""<AndroidGamepad>/leftStick/left"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
@@ -711,18 +874,117 @@ public @ControlMapping()
},
{
""name"": ""right"",
- ""id"": ""a34d795e-b1d2-4a30-acb2-3b66383fca58"",
- ""path"": ""<Keyboard>/d"",
+ ""id"": ""90f73151-584d-4c7f-8c5f-4fde1576a7db"",
+ ""path"": ""<Gamepad>/leftStick/right"",
""interactions"": """",
""processors"": """",
- ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""groups"": ""Gamepad;Android;KeyboardMouse;Keyboard;test"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
+ {
+ ""name"": """",
+ ""id"": ""1f5af94d-2401-4101-810d-aa90b8da334a"",
+ ""path"": ""<Mouse>/delta"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""KeyboardMouse"",
+ ""action"": ""LookCamera"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""f9ceb027-c649-4b56-98dd-f1890da745dc"",
+ ""path"": ""<Mouse>/leftButton"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Fire1 or Mouse left"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""95813c8e-abe5-4199-be95-7e3e39b14f25"",
+ ""path"": ""<Touchscreen>/primaryTouch/tap"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Android;KeyboardMouse;test;Gamepad;Keyboard"",
+ ""action"": ""Fire1 or Mouse left"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""a935a8d3-f97b-4133-b106-ffd5d47848e5"",
+ ""path"": ""<Keyboard>/#(p)"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""KeyboardMouse;test;Android;Gamepad;Keyboard"",
+ ""action"": ""Fire1 or Mouse left"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": ""1D Axis"",
+ ""id"": ""674edd5d-0252-4af1-85d7-aec527cb82ee"",
+ ""path"": ""1DAxis"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Camerazoom"",
+ ""isComposite"": true,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": ""negative"",
+ ""id"": ""62da26cb-39d7-47c0-ba72-d369256ea978"",
+ ""path"": ""<Keyboard>/n"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""Camerazoom"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""positive"",
+ ""id"": ""6322cc67-916f-48bf-b0ed-a175f15690ed"",
+ ""path"": ""<Keyboard>/h"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""Camerazoom"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": """",
+ ""id"": ""ae38136c-37bb-4f2d-8ec0-9e26af05d061"",
+ ""path"": ""<Mouse>/scroll"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": "";Keyboard&Mouse"",
+ ""action"": ""ScrollWheel"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""68508e0c-85c7-4f46-87cd-e982c0db2fb9"",
+ ""path"": ""<Mouse>/scroll"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard&Mouse;KeyboardMouse;test;Gamepad;Keyboard"",
+ ""action"": ""Camerazoom"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
{
""name"": ""2D Vector"",
- ""id"": ""7a953121-852c-4112-8ced-236bb1d00cf5"",
+ ""id"": ""33a065ed-7b59-469c-8cc9-9887df82398b"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
@@ -733,47 +995,157 @@ public @ControlMapping()
},
{
""name"": ""up"",
- ""id"": ""f84aacf1-8ce8-4377-9611-eadfc42b1093"",
- ""path"": ""<Keyboard>/numpad3"",
+ ""id"": ""b34f2e1c-d26b-45f3-8e84-72bdc2016c27"",
+ ""path"": ""<Keyboard>/numpad8"",
""interactions"": """",
""processors"": """",
- ""groups"": ""Android"",
+ ""groups"": """",
""action"": ""LookCamera"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
- ""id"": ""d0c62b39-0710-4d47-90e7-53d69f95e3d7"",
- ""path"": ""<Keyboard>/numpad1"",
+ ""id"": ""36aa08db-1ee6-40ae-a153-e28c5efd7fb6"",
+ ""path"": ""<Keyboard>/numpad2"",
""interactions"": """",
""processors"": """",
- ""groups"": ""Android"",
+ ""groups"": """",
""action"": ""LookCamera"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
- ""id"": ""714dba28-3d94-494c-9e71-c087283bb001"",
- ""path"": ""<Keyboard>/numpad7"",
+ ""id"": ""19448be5-968c-4931-ad24-15a20b8a73e9"",
+ ""path"": ""<Keyboard>/numpad4"",
""interactions"": """",
""processors"": """",
- ""groups"": ""Android"",
+ ""groups"": """",
""action"": ""LookCamera"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
- ""id"": ""04f70bd9-96b8-4988-99e9-b6fe025c0595"",
- ""path"": ""<Keyboard>/numpad9"",
+ ""id"": ""6c00f7a7-1e30-46dc-8e6b-a3dc2cdc966d"",
+ ""path"": ""<Keyboard>/numpad6"",
""interactions"": """",
""processors"": """",
- ""groups"": ""Android"",
+ ""groups"": """",
""action"": ""LookCamera"",
""isComposite"": false,
""isPartOfComposite"": true
+ },
+ {
+ ""name"": """",
+ ""id"": ""cc522087-b8c9-4e53-8cd2-92bafe68ac85"",
+ ""path"": ""*/{Cancel}"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""Cancel"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""f51201f6-2cae-4028-b78f-e37c90a76c29"",
+ ""path"": ""<Keyboard>/e"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""ToolMode"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""c90ff97a-c180-4293-8899-ebfff2ba374d"",
+ ""path"": ""<Keyboard>/tab"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""MathMode"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""a0571ab2-2410-40ce-bf07-55f4c7c9f026"",
+ ""path"": ""<Keyboard>/c"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Talking"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""0773b81d-2a2e-4923-b791-d8346d2a57b0"",
+ ""path"": ""<Keyboard>/m"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Modifier"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""f61c1fbf-aeb7-4751-927a-a68b2ae75aad"",
+ ""path"": ""<Keyboard>/l"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Load"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""62f961fa-f87e-4090-8e59-96233cb7747a"",
+ ""path"": ""<Keyboard>/s"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Save"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""4b2ac261-9cde-4611-a4d7-05bfe5a2603b"",
+ ""path"": ""<Keyboard>/backspace"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Reset"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""00f695ba-03bd-4a8c-9aac-fc8a3ad0dc8c"",
+ ""path"": ""<Keyboard>/u"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Undo"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""a49b8f65-1046-48b2-9391-421de4605ba2"",
+ ""path"": ""<Keyboard>/r"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""Redo"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
}
]
},
@@ -1378,10 +1750,22 @@ public @ControlMapping()
m_Actionmap1_Reset = m_Actionmap1.FindAction("Reset", throwIfNotFound: true);
m_Actionmap1_Undo = m_Actionmap1.FindAction("Undo", throwIfNotFound: true);
m_Actionmap1_Redo = m_Actionmap1.FindAction("Redo", throwIfNotFound: true);
- // Actnmp_HC_Bttn
- m_Actnmp_HC_Bttn = asset.FindActionMap("Actnmp_HC_Bttn", throwIfNotFound: true);
- m_Actnmp_HC_Bttn_Movement = m_Actnmp_HC_Bttn.FindAction("Movement", throwIfNotFound: true);
- m_Actnmp_HC_Bttn_LookCamera = m_Actnmp_HC_Bttn.FindAction("LookCamera", throwIfNotFound: true);
+ // Actnmp_HC
+ m_Actnmp_HC = asset.FindActionMap("Actnmp_HC", throwIfNotFound: true);
+ m_Actnmp_HC_Movement = m_Actnmp_HC.FindAction("Movement", throwIfNotFound: true);
+ m_Actnmp_HC_LookCamera = m_Actnmp_HC.FindAction("LookCamera", throwIfNotFound: true);
+ m_Actnmp_HC_Fire1orMouseleft = m_Actnmp_HC.FindAction("Fire1 or Mouse left", throwIfNotFound: true);
+ m_Actnmp_HC_Camerazoom = m_Actnmp_HC.FindAction("Camerazoom", throwIfNotFound: true);
+ m_Actnmp_HC_Cancel = m_Actnmp_HC.FindAction("Cancel", throwIfNotFound: true);
+ m_Actnmp_HC_ToolMode = m_Actnmp_HC.FindAction("ToolMode", throwIfNotFound: true);
+ m_Actnmp_HC_MathMode = m_Actnmp_HC.FindAction("MathMode", throwIfNotFound: true);
+ m_Actnmp_HC_Talking = m_Actnmp_HC.FindAction("Talking", throwIfNotFound: true);
+ m_Actnmp_HC_Modifier = m_Actnmp_HC.FindAction("Modifier", throwIfNotFound: true);
+ m_Actnmp_HC_Load = m_Actnmp_HC.FindAction("Load", throwIfNotFound: true);
+ m_Actnmp_HC_Save = m_Actnmp_HC.FindAction("Save", throwIfNotFound: true);
+ m_Actnmp_HC_Reset = m_Actnmp_HC.FindAction("Reset", throwIfNotFound: true);
+ m_Actnmp_HC_Undo = m_Actnmp_HC.FindAction("Undo", throwIfNotFound: true);
+ m_Actnmp_HC_Redo = m_Actnmp_HC.FindAction("Redo", throwIfNotFound: true);
// UI
m_UI = asset.FindActionMap("UI", throwIfNotFound: true);
m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true);
@@ -1587,34 +1971,94 @@ public void SetCallbacks(IActionmap1Actions instance)
}
public Actionmap1Actions @Actionmap1 => new Actionmap1Actions(this);
- // Actnmp_HC_Bttn
- private readonly InputActionMap m_Actnmp_HC_Bttn;
- private IActnmp_HC_BttnActions m_Actnmp_HC_BttnActionsCallbackInterface;
- private readonly InputAction m_Actnmp_HC_Bttn_Movement;
- private readonly InputAction m_Actnmp_HC_Bttn_LookCamera;
- public struct Actnmp_HC_BttnActions
+ // Actnmp_HC
+ private readonly InputActionMap m_Actnmp_HC;
+ private IActnmp_HCActions m_Actnmp_HCActionsCallbackInterface;
+ private readonly InputAction m_Actnmp_HC_Movement;
+ private readonly InputAction m_Actnmp_HC_LookCamera;
+ private readonly InputAction m_Actnmp_HC_Fire1orMouseleft;
+ private readonly InputAction m_Actnmp_HC_Camerazoom;
+ private readonly InputAction m_Actnmp_HC_Cancel;
+ private readonly InputAction m_Actnmp_HC_ToolMode;
+ private readonly InputAction m_Actnmp_HC_MathMode;
+ private readonly InputAction m_Actnmp_HC_Talking;
+ private readonly InputAction m_Actnmp_HC_Modifier;
+ private readonly InputAction m_Actnmp_HC_Load;
+ private readonly InputAction m_Actnmp_HC_Save;
+ private readonly InputAction m_Actnmp_HC_Reset;
+ private readonly InputAction m_Actnmp_HC_Undo;
+ private readonly InputAction m_Actnmp_HC_Redo;
+ public struct Actnmp_HCActions
{
private @ControlMapping m_Wrapper;
- public Actnmp_HC_BttnActions(@ControlMapping wrapper) { m_Wrapper = wrapper; }
- public InputAction @Movement => m_Wrapper.m_Actnmp_HC_Bttn_Movement;
- public InputAction @LookCamera => m_Wrapper.m_Actnmp_HC_Bttn_LookCamera;
- public InputActionMap Get() { return m_Wrapper.m_Actnmp_HC_Bttn; }
+ public Actnmp_HCActions(@ControlMapping wrapper) { m_Wrapper = wrapper; }
+ public InputAction @Movement => m_Wrapper.m_Actnmp_HC_Movement;
+ public InputAction @LookCamera => m_Wrapper.m_Actnmp_HC_LookCamera;
+ public InputAction @Fire1orMouseleft => m_Wrapper.m_Actnmp_HC_Fire1orMouseleft;
+ public InputAction @Camerazoom => m_Wrapper.m_Actnmp_HC_Camerazoom;
+ public InputAction @Cancel => m_Wrapper.m_Actnmp_HC_Cancel;
+ public InputAction @ToolMode => m_Wrapper.m_Actnmp_HC_ToolMode;
+ public InputAction @MathMode => m_Wrapper.m_Actnmp_HC_MathMode;
+ public InputAction @Talking => m_Wrapper.m_Actnmp_HC_Talking;
+ public InputAction @Modifier => m_Wrapper.m_Actnmp_HC_Modifier;
+ public InputAction @Load => m_Wrapper.m_Actnmp_HC_Load;
+ public InputAction @Save => m_Wrapper.m_Actnmp_HC_Save;
+ public InputAction @Reset => m_Wrapper.m_Actnmp_HC_Reset;
+ public InputAction @Undo => m_Wrapper.m_Actnmp_HC_Undo;
+ public InputAction @Redo => m_Wrapper.m_Actnmp_HC_Redo;
+ public InputActionMap Get() { return m_Wrapper.m_Actnmp_HC; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
- public static implicit operator InputActionMap(Actnmp_HC_BttnActions set) { return set.Get(); }
- public void SetCallbacks(IActnmp_HC_BttnActions instance)
+ public static implicit operator InputActionMap(Actnmp_HCActions set) { return set.Get(); }
+ public void SetCallbacks(IActnmp_HCActions instance)
{
- if (m_Wrapper.m_Actnmp_HC_BttnActionsCallbackInterface != null)
+ if (m_Wrapper.m_Actnmp_HCActionsCallbackInterface != null)
{
- @Movement.started -= m_Wrapper.m_Actnmp_HC_BttnActionsCallbackInterface.OnMovement;
- @Movement.performed -= m_Wrapper.m_Actnmp_HC_BttnActionsCallbackInterface.OnMovement;
- @Movement.canceled -= m_Wrapper.m_Actnmp_HC_BttnActionsCallbackInterface.OnMovement;
- @LookCamera.started -= m_Wrapper.m_Actnmp_HC_BttnActionsCallbackInterface.OnLookCamera;
- @LookCamera.performed -= m_Wrapper.m_Actnmp_HC_BttnActionsCallbackInterface.OnLookCamera;
- @LookCamera.canceled -= m_Wrapper.m_Actnmp_HC_BttnActionsCallbackInterface.OnLookCamera;
+ @Movement.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMovement;
+ @Movement.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMovement;
+ @Movement.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMovement;
+ @LookCamera.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnLookCamera;
+ @LookCamera.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnLookCamera;
+ @LookCamera.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnLookCamera;
+ @Fire1orMouseleft.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnFire1orMouseleft;
+ @Fire1orMouseleft.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnFire1orMouseleft;
+ @Fire1orMouseleft.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnFire1orMouseleft;
+ @Camerazoom.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnCamerazoom;
+ @Camerazoom.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnCamerazoom;
+ @Camerazoom.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnCamerazoom;
+ @Cancel.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnCancel;
+ @Cancel.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnCancel;
+ @Cancel.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnCancel;
+ @ToolMode.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnToolMode;
+ @ToolMode.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnToolMode;
+ @ToolMode.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnToolMode;
+ @MathMode.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMathMode;
+ @MathMode.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMathMode;
+ @MathMode.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMathMode;
+ @Talking.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnTalking;
+ @Talking.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnTalking;
+ @Talking.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnTalking;
+ @Modifier.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnModifier;
+ @Modifier.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnModifier;
+ @Modifier.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnModifier;
+ @Load.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnLoad;
+ @Load.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnLoad;
+ @Load.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnLoad;
+ @Save.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnSave;
+ @Save.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnSave;
+ @Save.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnSave;
+ @Reset.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnReset;
+ @Reset.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnReset;
+ @Reset.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnReset;
+ @Undo.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnUndo;
+ @Undo.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnUndo;
+ @Undo.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnUndo;
+ @Redo.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnRedo;
+ @Redo.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnRedo;
+ @Redo.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnRedo;
}
- m_Wrapper.m_Actnmp_HC_BttnActionsCallbackInterface = instance;
+ m_Wrapper.m_Actnmp_HCActionsCallbackInterface = instance;
if (instance != null)
{
@Movement.started += instance.OnMovement;
@@ -1623,10 +2067,46 @@ public void SetCallbacks(IActnmp_HC_BttnActions instance)
@LookCamera.started += instance.OnLookCamera;
@LookCamera.performed += instance.OnLookCamera;
@LookCamera.canceled += instance.OnLookCamera;
+ @Fire1orMouseleft.started += instance.OnFire1orMouseleft;
+ @Fire1orMouseleft.performed += instance.OnFire1orMouseleft;
+ @Fire1orMouseleft.canceled += instance.OnFire1orMouseleft;
+ @Camerazoom.started += instance.OnCamerazoom;
+ @Camerazoom.performed += instance.OnCamerazoom;
+ @Camerazoom.canceled += instance.OnCamerazoom;
+ @Cancel.started += instance.OnCancel;
+ @Cancel.performed += instance.OnCancel;
+ @Cancel.canceled += instance.OnCancel;
+ @ToolMode.started += instance.OnToolMode;
+ @ToolMode.performed += instance.OnToolMode;
+ @ToolMode.canceled += instance.OnToolMode;
+ @MathMode.started += instance.OnMathMode;
+ @MathMode.performed += instance.OnMathMode;
+ @MathMode.canceled += instance.OnMathMode;
+ @Talking.started += instance.OnTalking;
+ @Talking.performed += instance.OnTalking;
+ @Talking.canceled += instance.OnTalking;
+ @Modifier.started += instance.OnModifier;
+ @Modifier.performed += instance.OnModifier;
+ @Modifier.canceled += instance.OnModifier;
+ @Load.started += instance.OnLoad;
+ @Load.performed += instance.OnLoad;
+ @Load.canceled += instance.OnLoad;
+ @Save.started += instance.OnSave;
+ @Save.performed += instance.OnSave;
+ @Save.canceled += instance.OnSave;
+ @Reset.started += instance.OnReset;
+ @Reset.performed += instance.OnReset;
+ @Reset.canceled += instance.OnReset;
+ @Undo.started += instance.OnUndo;
+ @Undo.performed += instance.OnUndo;
+ @Undo.canceled += instance.OnUndo;
+ @Redo.started += instance.OnRedo;
+ @Redo.performed += instance.OnRedo;
+ @Redo.canceled += instance.OnRedo;
}
}
}
- public Actnmp_HC_BttnActions @Actnmp_HC_Bttn => new Actnmp_HC_BttnActions(this);
+ public Actnmp_HCActions @Actnmp_HC => new Actnmp_HCActions(this);
// UI
private readonly InputActionMap m_UI;
@@ -1794,10 +2274,22 @@ public interface IActionmap1Actions
void OnUndo(InputAction.CallbackContext context);
void OnRedo(InputAction.CallbackContext context);
}
- public interface IActnmp_HC_BttnActions
+ public interface IActnmp_HCActions
{
void OnMovement(InputAction.CallbackContext context);
void OnLookCamera(InputAction.CallbackContext context);
+ void OnFire1orMouseleft(InputAction.CallbackContext context);
+ void OnCamerazoom(InputAction.CallbackContext context);
+ void OnCancel(InputAction.CallbackContext context);
+ void OnToolMode(InputAction.CallbackContext context);
+ void OnMathMode(InputAction.CallbackContext context);
+ void OnTalking(InputAction.CallbackContext context);
+ void OnModifier(InputAction.CallbackContext context);
+ void OnLoad(InputAction.CallbackContext context);
+ void OnSave(InputAction.CallbackContext context);
+ void OnReset(InputAction.CallbackContext context);
+ void OnUndo(InputAction.CallbackContext context);
+ void OnRedo(InputAction.CallbackContext context);
}
public interface IUIActions
{
diff --git a/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions b/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions
index dc2f6ec0fec05e83b9ff198d58cf3ed609921c1c..d20a76f6984da25c7fbcc925fcaf03ca17d956bc 100644
--- a/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions
+++ b/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions
@@ -298,6 +298,61 @@
"isComposite": false,
"isPartOfComposite": true
},
+ {
+ "name": "2D Vector",
+ "id": "4d4f3df3-0f42-4ed0-8c68-96dfe3967cce",
+ "path": "2DVector",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Movement",
+ "isComposite": true,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "up",
+ "id": "1603a694-00a7-4077-b427-30b2c201b2b4",
+ "path": "<Gamepad>/leftStick/up",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "Movement",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "down",
+ "id": "d67b9667-baad-44df-a7bc-5fc5dadf677d",
+ "path": "<Gamepad>/leftStick/down",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "Movement",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "left",
+ "id": "322909e9-974e-41ab-86b8-0ebe2f17b81e",
+ "path": "<AndroidGamepad>/leftStick/left",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "Movement",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "right",
+ "id": "daf8bd19-cb0b-40ad-ac35-fb4f15a28b9f",
+ "path": "<Gamepad>/leftStick/right",
+ "interactions": "",
+ "processors": "",
+ "groups": "Gamepad;Android;KeyboardMouse;Keyboard;test",
+ "action": "Movement",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
{
"name": "",
"id": "74b23070-b002-405d-880f-612ed4af5d02",
@@ -565,32 +620,140 @@
]
},
{
- "name": "Actnmp_HC_Bttn",
- "id": "c5d06d07-2701-43c0-b3d3-64f20b18c93e",
+ "name": "Actnmp_HC",
+ "id": "3be62548-8d95-4444-a948-f9b29ce6663c",
"actions": [
{
"name": "Movement",
- "type": "Value",
- "id": "96b5cec0-5b2c-40af-9187-aa9025e85924",
+ "type": "PassThrough",
+ "id": "73d6fe4c-b811-4cd8-98e3-a48838c02866",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
- "initialStateCheck": true
+ "initialStateCheck": false
},
{
"name": "LookCamera",
- "type": "Value",
- "id": "ba69a09b-82ef-41b4-ada5-68abbd4497eb",
+ "type": "PassThrough",
+ "id": "b908e0f5-fd90-49c6-98d2-68259eb64102",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true
+ },
+ {
+ "name": "Fire1 or Mouse left",
+ "type": "Button",
+ "id": "32eb87eb-71fe-47ed-a2b0-625f3e15984f",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Camerazoom",
+ "type": "Button",
+ "id": "c6b285ee-9764-4bb5-8058-484846b168dc",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Cancel",
+ "type": "Button",
+ "id": "2520ff6f-1d3a-4bcc-8ba4-58d44f13b48b",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "ToolMode",
+ "type": "Button",
+ "id": "05854e86-61c3-49a4-bd16-10078394f422",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "MathMode",
+ "type": "Button",
+ "id": "1d0224c6-318d-4e32-9121-600fa1ed6433",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Talking",
+ "type": "Button",
+ "id": "2ca6f6fc-da4a-4e0e-9c88-fd38c218720f",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Modifier",
+ "type": "Button",
+ "id": "ace47207-3137-4639-9bc4-3abad8891b2e",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Load",
+ "type": "Button",
+ "id": "df491415-c02f-45dc-8c84-65dbbebc51dc",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Save",
+ "type": "Button",
+ "id": "7bd29b49-00f1-4197-88df-bcc229c91c3e",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Reset",
+ "type": "Button",
+ "id": "447bffd7-7d75-4774-85de-605377c7e00e",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Undo",
+ "type": "Button",
+ "id": "808a2930-227a-4e6b-a1d2-87382d9471c3",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Redo",
+ "type": "Button",
+ "id": "6e3aafb9-1986-41b1-a2ec-8a2c819e9fef",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
}
],
"bindings": [
{
- "name": "2D Vector",
- "id": "6a4f2c07-cad2-4a2d-9e91-7903b76475bf",
+ "name": "2D Vector _2",
+ "id": "b0536072-086c-4637-96cc-81242942834d",
"path": "2DVector",
"interactions": "",
"processors": "",
@@ -601,51 +764,51 @@
},
{
"name": "up",
- "id": "ba0d317c-b756-42f0-b3db-052fc72aa17b",
- "path": "<Keyboard>/numpad8",
+ "id": "7b6a695c-298f-4154-bbe8-135a863d3413",
+ "path": "<Keyboard>/w",
"interactions": "",
"processors": "",
- "groups": "",
+ "groups": "KeyboardMouse;Keyboard;test;Android;Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
- "id": "6b778def-7a6a-4a72-b2c3-0970c201d2f1",
- "path": "<Keyboard>/numpad5",
+ "id": "e68dd331-d7ad-4289-9f8e-70e73c0e8904",
+ "path": "<Keyboard>/s",
"interactions": "",
"processors": "",
- "groups": "",
+ "groups": "KeyboardMouse;Keyboard;test;Android;Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
- "id": "8f515e82-ac82-4e37-ab89-1f7cdb8f9ffc",
- "path": "<Keyboard>/numpad4",
+ "id": "1b47c1f7-c2f0-4d21-b113-0979196f4de1",
+ "path": "<Keyboard>/a",
"interactions": "",
"processors": "",
- "groups": "",
+ "groups": "KeyboardMouse;Keyboard;Gamepad;Android;test",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
- "id": "2fc809bb-8391-46b2-9044-3acc5410fb8c",
- "path": "<Keyboard>/numpad6",
+ "id": "808510ba-5d75-421b-a1f0-f3e714fdb612",
+ "path": "<Keyboard>/d",
"interactions": "",
"processors": "",
- "groups": "",
+ "groups": "KeyboardMouse;Keyboard;Gamepad;Android;test",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
- "name": "2D Vector _2",
- "id": "139f0316-2182-4790-b325-26fdab97a763",
+ "name": "2D Vector",
+ "id": "8a745d1e-af1b-4a19-831e-14013fcbe9bd",
"path": "2DVector",
"interactions": "",
"processors": "",
@@ -656,8 +819,8 @@
},
{
"name": "up",
- "id": "31fdda8e-7547-42b7-8d76-3519c726a994",
- "path": "<Keyboard>/w",
+ "id": "a72541d3-c138-486b-8cc4-42731aa31b76",
+ "path": "<Gamepad>/leftStick/up",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
@@ -667,8 +830,8 @@
},
{
"name": "down",
- "id": "17673297-b36e-47a5-9759-a21c782fcd46",
- "path": "<Keyboard>/s",
+ "id": "2077fce0-c086-49c5-a7d3-f823164c457a",
+ "path": "<Gamepad>/leftStick/down",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
@@ -678,8 +841,8 @@
},
{
"name": "left",
- "id": "9afd8031-3a04-44d3-9b4b-2f5649ee0a8d",
- "path": "<Keyboard>/a",
+ "id": "4a36e1ed-5df3-4912-9bd8-4f110958f5c7",
+ "path": "<AndroidGamepad>/leftStick/left",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
@@ -689,18 +852,117 @@
},
{
"name": "right",
- "id": "a34d795e-b1d2-4a30-acb2-3b66383fca58",
- "path": "<Keyboard>/d",
+ "id": "90f73151-584d-4c7f-8c5f-4fde1576a7db",
+ "path": "<Gamepad>/leftStick/right",
"interactions": "",
"processors": "",
- "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "groups": "Gamepad;Android;KeyboardMouse;Keyboard;test",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
+ {
+ "name": "",
+ "id": "1f5af94d-2401-4101-810d-aa90b8da334a",
+ "path": "<Mouse>/delta",
+ "interactions": "",
+ "processors": "",
+ "groups": "KeyboardMouse",
+ "action": "LookCamera",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "f9ceb027-c649-4b56-98dd-f1890da745dc",
+ "path": "<Mouse>/leftButton",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Fire1 or Mouse left",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "95813c8e-abe5-4199-be95-7e3e39b14f25",
+ "path": "<Touchscreen>/primaryTouch/tap",
+ "interactions": "",
+ "processors": "",
+ "groups": "Android;KeyboardMouse;test;Gamepad;Keyboard",
+ "action": "Fire1 or Mouse left",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "a935a8d3-f97b-4133-b106-ffd5d47848e5",
+ "path": "<Keyboard>/#(p)",
+ "interactions": "",
+ "processors": "",
+ "groups": "KeyboardMouse;test;Android;Gamepad;Keyboard",
+ "action": "Fire1 or Mouse left",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "1D Axis",
+ "id": "674edd5d-0252-4af1-85d7-aec527cb82ee",
+ "path": "1DAxis",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Camerazoom",
+ "isComposite": true,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "negative",
+ "id": "62da26cb-39d7-47c0-ba72-d369256ea978",
+ "path": "<Keyboard>/n",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "Camerazoom",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "positive",
+ "id": "6322cc67-916f-48bf-b0ed-a175f15690ed",
+ "path": "<Keyboard>/h",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "Camerazoom",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "",
+ "id": "ae38136c-37bb-4f2d-8ec0-9e26af05d061",
+ "path": "<Mouse>/scroll",
+ "interactions": "",
+ "processors": "",
+ "groups": ";Keyboard&Mouse",
+ "action": "ScrollWheel",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "68508e0c-85c7-4f46-87cd-e982c0db2fb9",
+ "path": "<Mouse>/scroll",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard&Mouse;KeyboardMouse;test;Gamepad;Keyboard",
+ "action": "Camerazoom",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
{
"name": "2D Vector",
- "id": "7a953121-852c-4112-8ced-236bb1d00cf5",
+ "id": "33a065ed-7b59-469c-8cc9-9887df82398b",
"path": "2DVector",
"interactions": "",
"processors": "",
@@ -711,47 +973,157 @@
},
{
"name": "up",
- "id": "f84aacf1-8ce8-4377-9611-eadfc42b1093",
- "path": "<Keyboard>/numpad3",
+ "id": "b34f2e1c-d26b-45f3-8e84-72bdc2016c27",
+ "path": "<Keyboard>/numpad8",
"interactions": "",
"processors": "",
- "groups": "Android",
+ "groups": "",
"action": "LookCamera",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
- "id": "d0c62b39-0710-4d47-90e7-53d69f95e3d7",
- "path": "<Keyboard>/numpad1",
+ "id": "36aa08db-1ee6-40ae-a153-e28c5efd7fb6",
+ "path": "<Keyboard>/numpad2",
"interactions": "",
"processors": "",
- "groups": "Android",
+ "groups": "",
"action": "LookCamera",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
- "id": "714dba28-3d94-494c-9e71-c087283bb001",
- "path": "<Keyboard>/numpad7",
+ "id": "19448be5-968c-4931-ad24-15a20b8a73e9",
+ "path": "<Keyboard>/numpad4",
"interactions": "",
"processors": "",
- "groups": "Android",
+ "groups": "",
"action": "LookCamera",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
- "id": "04f70bd9-96b8-4988-99e9-b6fe025c0595",
- "path": "<Keyboard>/numpad9",
+ "id": "6c00f7a7-1e30-46dc-8e6b-a3dc2cdc966d",
+ "path": "<Keyboard>/numpad6",
"interactions": "",
"processors": "",
- "groups": "Android",
+ "groups": "",
"action": "LookCamera",
"isComposite": false,
"isPartOfComposite": true
+ },
+ {
+ "name": "",
+ "id": "cc522087-b8c9-4e53-8cd2-92bafe68ac85",
+ "path": "*/{Cancel}",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "Cancel",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "f51201f6-2cae-4028-b78f-e37c90a76c29",
+ "path": "<Keyboard>/e",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "ToolMode",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "c90ff97a-c180-4293-8899-ebfff2ba374d",
+ "path": "<Keyboard>/tab",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "MathMode",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "a0571ab2-2410-40ce-bf07-55f4c7c9f026",
+ "path": "<Keyboard>/c",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Talking",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "0773b81d-2a2e-4923-b791-d8346d2a57b0",
+ "path": "<Keyboard>/m",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Modifier",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "f61c1fbf-aeb7-4751-927a-a68b2ae75aad",
+ "path": "<Keyboard>/l",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Load",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "62f961fa-f87e-4090-8e59-96233cb7747a",
+ "path": "<Keyboard>/s",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Save",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "4b2ac261-9cde-4611-a4d7-05bfe5a2603b",
+ "path": "<Keyboard>/backspace",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Reset",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "00f695ba-03bd-4a8c-9aac-fc8a3ad0dc8c",
+ "path": "<Keyboard>/u",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Undo",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "a49b8f65-1046-48b2-9391-421de4605ba2",
+ "path": "<Keyboard>/r",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "Redo",
+ "isComposite": false,
+ "isPartOfComposite": false
}
]
},
diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs
index e7a1cf37e8a7d4f6d4f93cbe07f5332bc096ad43..14c9e0d3391f0a9dc15c0c04fc6abdab7ff6f91d 100644
--- a/Assets/Scripts/UI/UIconfig.cs
+++ b/Assets/Scripts/UI/UIconfig.cs
@@ -8,6 +8,7 @@ public static class UIconfig
public static int FrameITUIversion = 2; // 1= FrameITUI; 2= FrameITUI_mobil
public static int InputManagerVersion = 1; // 1= InputManager, 2=InputSystemPackage ; 3=overConfigfile
+ public static int EventSystemModule = 2;// 1= InputManager, 2=InputSystemPackage ; 3=overConfigfile
public static int GameplayMode = 5; //5=First Person, 4=third, 3=third+, 2=Escaperoom, 1=Sidescroller, 0=Sidescroller+
public static int MainCameraID = 0; //0=Camera.main; 1=Cam1, 2=Cam2
@@ -48,6 +49,7 @@ public static class UIconfig
public static bool MouseKeepingInWindow=true;
+
public static Color colOnline = new Color(148f / 255f, 229f / 255f, 156f / 255f, 1f);
@@ -65,7 +67,7 @@ public static class UIconfig
public static float camRotatingSensitivity = 2f;//Sensitivity to inputs.
public static float camRotatingSensitivity_default = 1f; //slider 100% which value?
- public static float camRotatingSensitivity_sliderMax = 4f; //max value for slider
+ public static float camRotatingSensitivity_sliderMax = 10f; //max value for slider
//------------------------------------------------------------------------------------------------------
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 2e45b1b45b8a0798bacaf86cddecb7a92cdeed98..463e25abbe28dea578582e6a77cf800d7f19b363 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -699,9 +699,9 @@ PlayerSettings:
webGLDecompressionFallback: 0
scriptingDefineSymbols:
1: CROSS_PLATFORM_INPUT
- 4: CROSS_PLATFORM_INPUT
- 7: CROSS_PLATFORM_INPUT
- 14:
+ 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
+ 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT
+ 14: MOBILE_INPUT
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: