diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
index 5df0053f310c5d6fa0263721904560bbf50831dd..6fdb947b012b2ba3da88869286770b25433e8606 100644
--- a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
+++ b/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab
@@ -5394,6 +5394,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 73086010468002537, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 266457292856607210, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 266457292867989094, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -5509,6 +5519,11 @@ PrefabInstance:
propertyPath: parentM_GObj
value:
objectReference: {fileID: 5366996315580957714}
+ - target: {fileID: 266457293633753203, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 266457293646086086, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -5729,6 +5744,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 266457294651312793, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 266457294721115847, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchorMax.y
@@ -5749,6 +5769,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 1.2109375
objectReference: {fileID: 0}
+ - target: {fileID: 266457294901600500, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 266457294920758650, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -5769,6 +5794,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 1.375
objectReference: {fileID: 0}
+ - target: {fileID: 1987516481273447829, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1991285731648709218, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -5829,6 +5859,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 146.10156
objectReference: {fileID: 0}
+ - target: {fileID: 4336276574167657637, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4575270289447460879, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -5869,6 +5904,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7656239459856027651, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7694916313227907339, guid: c2b1781fb05a3d0478a9fb36c9db98b9,
type: 3}
propertyPath: m_AnchorMax.y
diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
index 36d48859437f6983dd5420094bf475719978352a..0341de362be84225ca3fb5ce7769c18bce708182 100644
--- a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
+++ b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
@@ -6109,6 +6109,108 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: (old system)
+--- !u!1 &1040945177747143868
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2804835764776683570}
+ - component: {fileID: 7732278557235409000}
+ m_Layer: 5
+ m_Name: CamSens_Slider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2804835764776683570
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1040945177747143868}
+ 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:
+ - {fileID: 6181997088362497784}
+ - {fileID: 7116002430756151160}
+ - {fileID: 2730940891335339023}
+ m_Father: {fileID: 9128785983299347962}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0.63000005}
+ m_AnchoredPosition: {x: -0.00012207031, y: 0}
+ m_SizeDelta: {x: 0.00027466, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7732278557235409000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1040945177747143868}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 8076055962581320292}
+ m_FillRect: {fileID: 3858128853675325590}
+ m_HandleRect: {fileID: 4654362771177702286}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 1
+ m_WholeNumbers: 0
+ m_Value: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 6722591843123350596}
+ m_TargetAssemblyTypeName: GameplayOptionsMenue_mobile, Assembly-CSharp
+ m_MethodName: CamSensitivityBttn
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &1114371742251588745
GameObject:
m_ObjectHideFlags: 0
@@ -7772,6 +7874,87 @@ MonoBehaviour:
m_EditorClassIdentifier:
backTo_GObj: {fileID: 3680199913404635203}
parentM_GObj: {fileID: 220600721669129657}
+--- !u!1 &2498737387980374133
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9128785983299347962}
+ - component: {fileID: 943995808292752273}
+ - component: {fileID: 2855938761595602071}
+ m_Layer: 5
+ m_Name: CamSensitivityT (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &9128785983299347962
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2498737387980374133}
+ 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:
+ - {fileID: 3498722444900472700}
+ - {fileID: 2804835764776683570}
+ m_Father: {fileID: 8776943957362461931}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.1, y: 0.3}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &943995808292752273
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2498737387980374133}
+ m_CullTransparentMesh: 1
+--- !u!114 &2855938761595602071
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2498737387980374133}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
--- !u!1 &2569672001231380268
GameObject:
m_ObjectHideFlags: 0
@@ -7872,6 +8055,81 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
+--- !u!1 &2662978987907121971
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6181997088362497784}
+ - component: {fileID: 2613470424752420641}
+ - component: {fileID: 2989899662140599671}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6181997088362497784
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2662978987907121971}
+ 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: 2804835764776683570}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.35}
+ m_AnchorMax: {x: 1, y: 0.65}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2613470424752420641
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2662978987907121971}
+ m_CullTransparentMesh: 1
+--- !u!114 &2989899662140599671
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2662978987907121971}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &2731204400257043868
GameObject:
m_ObjectHideFlags: 0
@@ -9615,6 +9873,81 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Press for deactivating
+--- !u!1 &4473797937538130870
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3858128853675325590}
+ - component: {fileID: 4892154412440289053}
+ - component: {fileID: 5812790826650564862}
+ m_Layer: 5
+ m_Name: Fill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3858128853675325590
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4473797937538130870}
+ 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: 7116002430756151160}
+ 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: 10, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4892154412440289053
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4473797937538130870}
+ m_CullTransparentMesh: 1
+--- !u!114 &5812790826650564862
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4473797937538130870}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &4694331417230483847
GameObject:
m_ObjectHideFlags: 0
@@ -9849,6 +10182,81 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Input_System_Package Bindings
+--- !u!1 &4872602182159177862
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4654362771177702286}
+ - component: {fileID: 8889454401568778347}
+ - component: {fileID: 8076055962581320292}
+ m_Layer: 5
+ m_Name: Handle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4654362771177702286
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4872602182159177862}
+ 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: 2730940891335339023}
+ 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: 66, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8889454401568778347
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4872602182159177862}
+ m_CullTransparentMesh: 1
+--- !u!114 &8076055962581320292
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4872602182159177862}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: c55a4c383f1a08146a6a21a5f34d616b, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &4978350312788511290
GameObject:
m_ObjectHideFlags: 0
@@ -10438,6 +10846,42 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Touch-Control Options
+--- !u!1 &5222096845344016696
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7116002430756151160}
+ m_Layer: 5
+ m_Name: Fill Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7116002430756151160
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5222096845344016696}
+ 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:
+ - {fileID: 3858128853675325590}
+ m_Father: {fileID: 2804835764776683570}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.35}
+ m_AnchorMax: {x: 1, y: 0.65}
+ m_AnchoredPosition: {x: -5, y: 0}
+ m_SizeDelta: {x: -20, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5262509579923972088
GameObject:
m_ObjectHideFlags: 0
@@ -11373,6 +11817,85 @@ MonoBehaviour:
Opsys_ButtonUT: {fileID: 7635230150363548799}
FrameITUI_ButtonT: {fileID: 4058364548222253969}
FrameITUI_ButtonUT: {fileID: 1363689793225369312}
+--- !u!1 &6452779043354037049
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3498722444900472700}
+ - component: {fileID: 8163391053638617082}
+ - component: {fileID: 3838666597549968973}
+ m_Layer: 5
+ m_Name: CamSensText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3498722444900472700
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6452779043354037049}
+ 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: 9128785983299347962}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1.2}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8163391053638617082
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6452779043354037049}
+ m_CullTransparentMesh: 1
+--- !u!114 &3838666597549968973
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6452779043354037049}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 40
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 4
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Sensitivity of Camera 0%
--- !u!1 &6571837020454406035
GameObject:
m_ObjectHideFlags: 0
@@ -12688,6 +13211,7 @@ RectTransform:
- {fileID: 8577708354842425628}
- {fileID: 3017080786048877539}
- {fileID: 8898442270612605721}
+ - {fileID: 9128785983299347962}
m_Father: {fileID: 3707783715562607281}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13540,6 +14064,8 @@ MonoBehaviour:
cllscaleAll_SliderT: {fileID: 1183576220687625782}
cursorScaler_Slider: {fileID: 1953939502788548578}
cursorScaler_SliderT: {fileID: 7127188211372885989}
+ CamSens_Slider: {fileID: 1040945177747143868}
+ CamSens_SliderT: {fileID: 6452779043354037049}
cursorArrow_35: {fileID: 2800000, guid: 5220430f15bc26f44a1d67083ad70598, type: 3}
cursorArrow_50: {fileID: 2800000, guid: e3f1dc3678ee47d4a9e81418681873f6, type: 3}
cursorArrow_60: {fileID: 2800000, guid: b21244787efeae346bf3456d012ef399, type: 3}
@@ -13702,6 +14228,42 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Touch-Control Options
+--- !u!1 &8702967903516298016
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2730940891335339023}
+ m_Layer: 5
+ m_Name: Handle Slide Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2730940891335339023
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8702967903516298016}
+ 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:
+ - {fileID: 4654362771177702286}
+ m_Father: {fileID: 2804835764776683570}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -20, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8709940381895199125
GameObject:
m_ObjectHideFlags: 0
@@ -14520,15 +15082,15 @@ PrefabInstance:
objectReference: {fileID: 266457293881304185}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2c2cf35f8e593ea44b2050d129ee23a4, type: 3}
---- !u!1 &266457294901600504 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 6804933134010575747, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
- type: 3}
- m_PrefabInstance: {fileID: 6763667626336422779}
- m_PrefabAsset: {fileID: 0}
--- !u!224 &266457294901600505 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6804933134010575746, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
type: 3}
m_PrefabInstance: {fileID: 6763667626336422779}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &266457294901600504 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 6804933134010575747, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
+ type: 3}
+ m_PrefabInstance: {fileID: 6763667626336422779}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menues/LaunchMenue.unity
index b9fdfcb3d895180f12dbac63b338d25a59b4c961..f6c654e1913814ae5d4b846a7790485083d63d55 100644
--- a/Assets/Scenes/Menues/LaunchMenue.unity
+++ b/Assets/Scenes/Menues/LaunchMenue.unity
@@ -818,7 +818,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1604326196}
- m_Enabled: 0
+ m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name:
@@ -886,7 +886,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1604326196}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index e82b13022119b0e0ee08d8041b1a924cf7d39fe4..4c82ca3895c146330b46fa4687dc955666641d66 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -11982,6 +11982,7 @@ GameObject:
- component: {fileID: 424784667}
- component: {fileID: 424784669}
- component: {fileID: 424784666}
+ - component: {fileID: 424784670}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
@@ -11996,7 +11997,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: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name:
@@ -12064,7 +12065,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: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
@@ -12076,6 +12077,45 @@ MonoBehaviour:
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
+--- !u!114 &424784670
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 424784665}
+ 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!1001 &425123567
PrefabInstance:
m_ObjectHideFlags: 0
@@ -39586,6 +39626,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2895783019230578255, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3113042674841273851, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_Enabled
@@ -39776,6 +39821,11 @@ PrefabInstance:
propertyPath: m_Name
value: StartM_3_1_2
objectReference: {fileID: 0}
+ - target: {fileID: 6715622235975056727, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6899299219359387209, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_AnchorMax.y
diff --git a/Assets/Scripts/Loading/StreamingAssetLoader.cs b/Assets/Scripts/Loading/StreamingAssetLoader.cs
index 671b5da85a6c068b829637ba1f8edd4692cf2ae4..ffa8c4883697d0f20779393f9433e39cf79b0e6b 100644
--- a/Assets/Scripts/Loading/StreamingAssetLoader.cs
+++ b/Assets/Scripts/Loading/StreamingAssetLoader.cs
@@ -87,6 +87,7 @@ public static void NetworkJSON_Save()
myObject.InputManagerVersion = UIconfig.InputManagerVersion;
myObject.colliderScale_all = UIconfig.colliderScale_all;
myObject.cursorSize = UIconfig.cursorSize;
+ myObject.camRotatingSensitivity = UIconfig.camRotatingSensitivity;
@@ -281,6 +282,14 @@ public static void NetworkJSON_Load()
{
UIconfig.cursorSize = myObjs.cursorSize;
}
+ if (false)
+ {
+
+ }
+ else
+ {
+ UIconfig.camRotatingSensitivity = myObjs.camRotatingSensitivity;
+ }
}
diff --git a/Assets/Scripts/StartServer.cs b/Assets/Scripts/StartServer.cs
index 0d60e3f25bddd932cfa0618f9b49c695b3926a3a..7f852371cf6c2e2084595ea95788dededd98736a 100644
--- a/Assets/Scripts/StartServer.cs
+++ b/Assets/Scripts/StartServer.cs
@@ -147,8 +147,8 @@ IEnumerator ServerRoutine()
while (true)
{
- //Wait for 1 seconds
- yield return new WaitForSecondsRealtime(1f);
+ //Wait for 2 seconds
+ yield return new WaitForSecondsRealtime(2f);
print("waiting");
request = UnityWebRequest.Get(CommunicationEvents.ServerAddressLocal + "/scroll/list");
diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
index 6a57f67a71425574c46ad7461b39bce16a572736..fb2b2e5a8bb93467f3c620428461a7d3e84b5d61 100644
--- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
+++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
@@ -49,6 +49,25 @@ public class FirstPersonController1 : MonoBehaviour
public string Running_keyBind;
+ private void Awake()
+ {
+ //New InputSystem
+ input_ControlMapping = new ControlMapping();
+ input_ControlMapping.Actionmap1.Movement.Enable();
+ input_ControlMapping.Actionmap1.LookCamera.Enable();
+ //input_ControlMapping.Actionmap1.Movement.
+ }
+ private void OnEnable()
+ {
+ input_ControlMapping.Actionmap1.Movement.Enable();
+ input_ControlMapping.Actionmap1.LookCamera.Enable();
+ }
+
+ private void OnDisable()
+ {
+ input_ControlMapping.Actionmap1.Movement.Disable();
+ input_ControlMapping.Actionmap1.LookCamera.Disable();
+ }
// Use this for initialization
private void Start()
@@ -64,10 +83,7 @@ private void Start()
m_AudioSource = GetComponent<AudioSource>();
m_MouseLook.Init(transform, m_Camera.transform);
- //New InputSystem
- input_ControlMapping = new ControlMapping();
- input_ControlMapping.Actionmap1.Movement.Enable();
- //input_ControlMapping.Actionmap1.Movement.
+
}
@@ -250,6 +266,7 @@ 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.
m_Input = a;
diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
index eecdd101881ae7d873141c990e7fecc246764de9..cad599f6d9c87840b5bd1e953e2d1197a67c8a98 100644
--- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
+++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
@@ -31,6 +31,8 @@ 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();
}
@@ -39,6 +41,10 @@ public void Init(Transform character, Transform camera)
public void LookRotation(Transform character, Transform camera)
{
+ XSensitivity = UIconfig.camRotatingSensitivity;
+ YSensitivity = XSensitivity;
+
+
float yRot=0;
float xRot=0;
@@ -54,8 +60,13 @@ public void LookRotation(Transform character, Transform camera)
if (UIconfig.InputManagerVersion == 2)
{
Vector2 a = input_ControlMapping.Actionmap1.LookCamera.ReadValue<Vector2>();
- xRot = a.x * XSensitivity;
- yRot = a.y * XSensitivity;
+ yRot = a.x * XSensitivity * 0.1f ;
+ xRot = a.y * YSensitivity * 0.1f;
+
+
+
+ //xRot = XSensitivity * input_ControlMapping.Actionmap1.MouseX.ReadValue<float>();
+ //yRot = 100* YSensitivity * input_ControlMapping.Actionmap1.MouseY.ReadValue<float>();
}
if (UIconfig.InputManagerVersion == 3)
{
@@ -105,8 +116,8 @@ public void LookRotation(Transform character, Transform camera)
camera.localRotation = m_CameraTargetRot;//Wieso magst du nicht nach Build!
}
- //if (yRot != 0) { Debug.Log("my" + yRot); Debug.Log("mc" + camera.localRotation); }
- //if (xRot != 0) { Debug.Log("mx" + xRot); Debug.Log("mc" + camera.localRotation); } //Hoch runter
+ if (yRot != 0) { Debug.Log("my" + yRot); Debug.Log("mc" + camera.localRotation); }
+ if (xRot != 0) { Debug.Log("mx" + xRot); Debug.Log("mc" + camera.localRotation); } //Hoch runter
UpdateCursorLock();
}
diff --git a/Assets/Scripts/UI/HideUI_mobile.cs b/Assets/Scripts/UI/HideUI_mobile.cs
index 1ee3de2cfe5af8cb6dfd800d13a1ac616d5d4ed0..7a8e3babaaf9b34736a647203f02ef2ddabfab7a 100644
--- a/Assets/Scripts/UI/HideUI_mobile.cs
+++ b/Assets/Scripts/UI/HideUI_mobile.cs
@@ -3,6 +3,7 @@
using static CommunicationEvents;
using static UIconfig;
using static Restart;
+using System.Collections;
public class HideUI_mobile : MonoBehaviour
{
@@ -22,14 +23,42 @@ public string
public string toolMode_keyBind;
public string MathMode_keyBind;
public string cancel_keyBind;
+ public float waitingBetweenInputs = 0.2f;
public UnityStandardAssets.Characters.FirstPerson.FirstPersonController CamControl_StdAsset;
public Characters.FirstPerson.FirstPersonController1 CamControl_ScriptChar;
public bool LockOnly = true;
public MeshRenderer CursorRenderer;
+ private double numinputtrigger=0;
internal Canvas UICanvas;
+ private ControlMapping input_ControlMapping;
+
+
+ private void Awake()
+ {
+ //New InputSystem
+ input_ControlMapping = new ControlMapping();
+ input_ControlMapping.Actionmap1.Cancel.Enable();
+ input_ControlMapping.Actionmap1.ToolMode.Enable();
+ input_ControlMapping.Actionmap1.MathMode.Enable();
+
+ }
+ private void OnEnable()
+ {
+ input_ControlMapping.Actionmap1.Cancel.Enable();
+ input_ControlMapping.Actionmap1.ToolMode.Enable();
+ input_ControlMapping.Actionmap1.MathMode.Enable();
+ }
+
+ private void OnDisable()
+ {
+ input_ControlMapping.Actionmap1.Cancel.Disable();
+ input_ControlMapping.Actionmap1.ToolMode.Disable();
+ input_ControlMapping.Actionmap1.MathMode.Disable();
+ }
+
void Start()
@@ -73,6 +102,8 @@ void Start2()
//Start3();
//CamControl.enabled = true;
+ StartCoroutine(slowInput());
+
}
void Start3()
@@ -100,10 +131,12 @@ void Start3()
// Update is called once per frame
void Update()
{
+
if (UIconfig.FrameITUIversion == 2)
{
Update3();
}
+
//print("dada" + UIconfig.CanvasOnOff_Array[4]);
}
@@ -151,6 +184,18 @@ void setUI_Vis_walk(int a)
+
+ IEnumerator slowInput()
+ {
+
+ yield return new WaitForSecondsRealtime(waitingBetweenInputs);
+
+ numinputtrigger = 0;
+
+
+ yield return null;
+
+ }
void CheckIf()
{
@@ -183,6 +228,36 @@ void CheckIf()
}
return;
}
+ if (UIconfig.InputManagerVersion == 2 && numinputtrigger==0)
+ {
+ if (input_ControlMapping.Actionmap1.ToolMode.ReadValue<float>() != 0)
+ {
+ UIconfig.CanvasOnOff_Array[14] = 1;
+ UIconfig.CanvasOnOff_Array[20] = 0;
+ numinputtrigger++;
+ StartCoroutine(slowInput());
+ return;
+ }
+ if (input_ControlMapping.Actionmap1.MathMode.ReadValue<float>() != 0)
+ {
+
+ UIconfig.CanvasOnOff_Array[16] = 1;
+ UIconfig.CanvasOnOff_Array[20] = 0;
+ numinputtrigger++;
+ StartCoroutine(slowInput());
+ return;
+ }
+
+ if (input_ControlMapping.Actionmap1.Cancel.ReadValue<float>() != 0)
+ {
+ UIconfig.CanvasOnOff_Array[02] = 1;
+ UIconfig.CanvasOnOff_Array[10] = 0;
+ numinputtrigger++;
+ StartCoroutine(slowInput());
+ return;
+ }
+ return;
+ }
}
@@ -213,31 +288,83 @@ void CheckIf()
}
return;
}
+ if (UIconfig.InputManagerVersion == 2 && numinputtrigger == 0)
+ {
+ if (input_ControlMapping.Actionmap1.ToolMode.ReadValue<float>() != 0)
+ {
+ UIconfig.CanvasOnOff_Array[14] = 0;
+ UIconfig.CanvasOnOff_Array[20] = 1;
+ numinputtrigger++;
+ StartCoroutine(slowInput());
+ return;
+ }
+ if (input_ControlMapping.Actionmap1.MathMode.ReadValue<float>() != 0)
+ {
+
+ UIconfig.CanvasOnOff_Array[14] = 0;
+ UIconfig.CanvasOnOff_Array[16] = 1;
+ numinputtrigger++;
+ StartCoroutine(slowInput());
+ return;
+ }
+
+ if (input_ControlMapping.Actionmap1.Cancel.ReadValue<float>() != 0)
+ {
+ UIconfig.CanvasOnOff_Array[02] = 1;
+ UIconfig.CanvasOnOff_Array[10] = 0;
+ numinputtrigger++;
+ StartCoroutine(slowInput());
+ return;
+ }
+ return;
+ }
}
//PauseMenue
//MathMenue
if (UIconfig.InputManagerVersion == 1)
{
- if (Input.GetButtonDown(MathMode_keyBind))
- {
+ if (Input.GetButtonDown(MathMode_keyBind))
+ {
- UIconfig.CanvasOnOff_Array[16] = 0;
- UIconfig.CanvasOnOff_Array[20] = 1;
- return;
- }
- if (Input.GetButtonDown(cancel_keyBind))
- {
+ UIconfig.CanvasOnOff_Array[16] = 0;
+ UIconfig.CanvasOnOff_Array[20] = 1;
+ return;
+ }
+ if (Input.GetButtonDown(cancel_keyBind))
+ {
- UIconfig.CanvasOnOff_Array[02] = 1;
- UIconfig.CanvasOnOff_Array[10] = 0;
+ UIconfig.CanvasOnOff_Array[02] = 1;
+ UIconfig.CanvasOnOff_Array[10] = 0;
+ return;
+ }
return;
- }
- return;
}
- }
+ if (UIconfig.InputManagerVersion == 2 && numinputtrigger == 0)
+ {
+ if (input_ControlMapping.Actionmap1.MathMode.ReadValue<float>() != 0)
+ {
+
+ UIconfig.CanvasOnOff_Array[16] = 0;
+ UIconfig.CanvasOnOff_Array[20] = 1;
+ numinputtrigger++;
+ StartCoroutine(slowInput());
+ return;
+ }
+ if (input_ControlMapping.Actionmap1.Cancel.ReadValue<float>() != 0)
+ {
+ UIconfig.CanvasOnOff_Array[02] = 1;
+ UIconfig.CanvasOnOff_Array[10] = 0;
+ numinputtrigger++;
+ StartCoroutine(slowInput());
+ return;
+ }
+ return;
+
+ }
+ }
@@ -382,9 +509,6 @@ void CheckUI_Vis()
void Update2()
{
-
-
-
if (Input.GetButton(modifier))
{
if (Input.GetButtonDown(modundo))
@@ -400,9 +524,7 @@ void Update2()
StageStatic.stage.factState.hardreset();
StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder);
}
- }
-
-
+ }
/*
//Todo before capturing: Make directories "UFrameIT-Screenshots/Unity_ScreenCapture" in project folder
diff --git a/Assets/Scripts/UI/MainMenue/QuitApp.cs b/Assets/Scripts/UI/MainMenue/QuitApp.cs
index 4dbcc1099ca5b1bfee5dbcd20d0aa37cf41a7136..b358ac50bfd91b29e15863f67943ee0a71478ac1 100644
--- a/Assets/Scripts/UI/MainMenue/QuitApp.cs
+++ b/Assets/Scripts/UI/MainMenue/QuitApp.cs
@@ -44,7 +44,13 @@ public void QuitApp1()
//Input.backButtonLeavesApp = true;
NetworkJSON_Save();
- process_mmt_frameIT_server.Kill();
+ if (process_mmt_frameIT_server != null)
+ {
+ if (!process_mmt_frameIT_server.HasExited) {
+ process_mmt_frameIT_server.Kill();
+ }
+ }
+
#if UNITY_EDITOR
UnityEditor.EditorApplication.isPlaying = false;
diff --git a/Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs b/Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs
index ba839a600d4d94336c1a643db91523d0fe8eeef3..82857db4a7a4c05142657169d3f8203d1db82ae4 100644
--- a/Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs
+++ b/Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs
@@ -18,6 +18,8 @@ public class GameplayOptionsMenue_mobile : MonoBehaviour
public GameObject cllscaleAll_SliderT;
public GameObject cursorScaler_Slider;
public GameObject cursorScaler_SliderT;
+ public GameObject CamSens_Slider;
+ public GameObject CamSens_SliderT;
public Texture2D cursorArrow_35;
public Texture2D cursorArrow_50;
@@ -37,16 +39,7 @@ public class GameplayOptionsMenue_mobile : MonoBehaviour
void Start()
{
- cllscaleAll_Slider.GetComponent<Slider>().value = (float)(UIconfig.colliderScale_all / (UIconfig.colliderScale_all_default * UIconfig.colliderScale_all_SliderMax));
- ScaleColliderAllBttn();
-
- cursorScaler_Slider.GetComponent<Slider>().value = (float)((UIconfig.cursorSize) / (UIconfig.cursorsize_default * UIconfig.cursorSize_SliderMax));
- mousePointerScaleBttn();
-
-
-
-
}
private void Update()
@@ -57,6 +50,8 @@ private void Update()
cursorScaler_Slider.GetComponent<Slider>().value = (float)((UIconfig.cursorSize) / (UIconfig.cursorsize_default * UIconfig.cursorSize_SliderMax));
mousePointerScaleBttn();
+ CamSens_Slider.GetComponent<Slider>().value = (float)((UIconfig.camRotatingSensitivity) / (UIconfig.camRotatingSensitivity_default * UIconfig.camRotatingSensitivity_sliderMax));
+ CamSensitivityBttn();
}
@@ -79,11 +74,15 @@ public void mousePointerScaleBttn()
{
UIconfig.cursorSize = cursorScaler_Slider.GetComponent<Slider>().value * UIconfig.cursorSize_SliderMax *UIconfig.cursorsize_default;
double zwischenRechn = 100 * (UIconfig.cursorSize)/ (UIconfig.cursorsize_default);
- cursorScaler_SliderT.GetComponent<Text>().text = "Size of MouseCursor " + (int)(zwischenRechn) + "%";
+ cursorScaler_SliderT.GetComponent<Text>().text = "Size of MouseCursor is " + (int)(zwischenRechn) + "%";
setMouse();
-
-
-
+ }
+ public void CamSensitivityBttn()
+ {
+ UIconfig.camRotatingSensitivity = CamSens_Slider.GetComponent<Slider>().value * UIconfig.camRotatingSensitivity_sliderMax * UIconfig.camRotatingSensitivity_default;
+ double zwischenRechn = 100 * (UIconfig.camRotatingSensitivity); // /(UIconfig.camRotatingSensitivity_default);
+ CamSens_SliderT.GetComponent<Text>().text = "Sensitivity of Camera is " + (int)(zwischenRechn) + "%";
+
}
public void setMouse()
diff --git a/Assets/Scripts/UI/PlayerControls/ControlMapping.cs b/Assets/Scripts/UI/PlayerControls/ControlMapping.cs
index 4b1158ea9ca99968b410f2f46bff36cf8812d04a..1b4a2c551b1faad634c5fea01dd476e5f44d81d4 100644
--- a/Assets/Scripts/UI/PlayerControls/ControlMapping.cs
+++ b/Assets/Scripts/UI/PlayerControls/ControlMapping.cs
@@ -29,16 +29,16 @@ public @ControlMapping()
""actions"": [
{
""name"": ""Movement"",
- ""type"": ""Value"",
+ ""type"": ""PassThrough"",
""id"": ""f1c2c6f3-2542-45df-8f4e-7660f5fe7215"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """",
- ""initialStateCheck"": true
+ ""initialStateCheck"": false
},
{
""name"": ""LookCamera"",
- ""type"": ""Value"",
+ ""type"": ""PassThrough"",
""id"": ""c189c0be-0f75-45a9-94b3-d0dd52a2af19"",
""expectedControlType"": ""Vector2"",
""processors"": """",
@@ -62,6 +62,33 @@ public @ControlMapping()
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
+ },
+ {
+ ""name"": ""Cancel"",
+ ""type"": ""Button"",
+ ""id"": ""d5aafbfd-31bc-402e-89dc-c21c91212bbc"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""ToolMode"",
+ ""type"": ""Button"",
+ ""id"": ""55269451-4704-48a9-8528-ca0d3b495ab2"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
+ },
+ {
+ ""name"": ""MathMode"",
+ ""type"": ""Button"",
+ ""id"": ""f79249da-97b2-4a72-b594-aa21e58472a9"",
+ ""expectedControlType"": ""Button"",
+ ""processors"": """",
+ ""interactions"": """",
+ ""initialStateCheck"": false
}
],
""bindings"": [
@@ -231,59 +258,15 @@ public @ControlMapping()
""isPartOfComposite"": true
},
{
- ""name"": ""2D Vector"",
- ""id"": ""d4170212-8606-46f7-94be-9a9ff4a741a8"",
- ""path"": ""2DVector"",
- ""interactions"": """",
- ""processors"": """",
- ""groups"": """",
- ""action"": ""LookCamera"",
- ""isComposite"": true,
- ""isPartOfComposite"": false
- },
- {
- ""name"": ""up"",
- ""id"": ""5d6c453d-e001-480e-a604-953e77642d6c"",
- ""path"": ""<Keyboard>/numpad3"",
- ""interactions"": """",
- ""processors"": """",
- ""groups"": ""Keyboard"",
- ""action"": ""LookCamera"",
- ""isComposite"": false,
- ""isPartOfComposite"": true
- },
- {
- ""name"": ""down"",
- ""id"": ""97c3ed7d-c04a-4f94-b639-0fc28808557d"",
- ""path"": ""<Keyboard>/numpad1"",
- ""interactions"": """",
- ""processors"": """",
- ""groups"": ""Keyboard"",
- ""action"": ""LookCamera"",
- ""isComposite"": false,
- ""isPartOfComposite"": true
- },
- {
- ""name"": ""left"",
- ""id"": ""678190c9-2651-42f0-9645-57e650c66c1e"",
- ""path"": ""<Keyboard>/numpad7"",
- ""interactions"": """",
- ""processors"": """",
- ""groups"": ""Keyboard"",
- ""action"": ""LookCamera"",
- ""isComposite"": false,
- ""isPartOfComposite"": true
- },
- {
- ""name"": ""right"",
- ""id"": ""d22fd6f5-e74c-4d44-8b78-c2b37fc1fb20"",
- ""path"": ""<Keyboard>/numpad9"",
+ ""name"": """",
+ ""id"": ""74b23070-b002-405d-880f-612ed4af5d02"",
+ ""path"": ""<Mouse>/delta"",
""interactions"": """",
""processors"": """",
- ""groups"": ""Keyboard"",
+ ""groups"": ""KeyboardMouse"",
""action"": ""LookCamera"",
""isComposite"": false,
- ""isPartOfComposite"": true
+ ""isPartOfComposite"": false
},
{
""name"": """",
@@ -372,6 +355,94 @@ public @ControlMapping()
""action"": ""Camerazoom"",
""isComposite"": false,
""isPartOfComposite"": false
+ },
+ {
+ ""name"": ""2D Vector"",
+ ""id"": ""decbe076-f3ef-4110-8971-21b6ee602241"",
+ ""path"": ""2DVector"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": """",
+ ""action"": ""LookCamera"",
+ ""isComposite"": true,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": ""up"",
+ ""id"": ""7d56a2a0-5950-4aa1-898e-32855d5f7256"",
+ ""path"": ""<Keyboard>/numpad3"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard"",
+ ""action"": ""LookCamera"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""down"",
+ ""id"": ""a24afabd-506f-4388-87eb-33cfbaaaa35d"",
+ ""path"": ""<Keyboard>/numpad1"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard"",
+ ""action"": ""LookCamera"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""left"",
+ ""id"": ""69383c90-a869-4729-a411-59df74ef0f39"",
+ ""path"": ""<Keyboard>/numpad7"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard"",
+ ""action"": ""LookCamera"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": ""right"",
+ ""id"": ""37505022-8b8d-4d6a-80b1-55712e986989"",
+ ""path"": ""<Keyboard>/numpad9"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard"",
+ ""action"": ""LookCamera"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": true
+ },
+ {
+ ""name"": """",
+ ""id"": ""737cc53a-9e90-4fc4-b809-b0a203eaffd6"",
+ ""path"": ""*/{Cancel}"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""Cancel"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""9b7bf0e3-7480-4381-bee8-9c3bcc373bf6"",
+ ""path"": ""<Keyboard>/e"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""ToolMode"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
+ },
+ {
+ ""name"": """",
+ ""id"": ""d4c7df8f-769c-4d15-a143-815f5c86b485"",
+ ""path"": ""<Keyboard>/tab"",
+ ""interactions"": """",
+ ""processors"": """",
+ ""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
+ ""action"": ""MathMode"",
+ ""isComposite"": false,
+ ""isPartOfComposite"": false
}
]
},
@@ -1157,6 +1228,9 @@ public @ControlMapping()
m_Actionmap1_LookCamera = m_Actionmap1.FindAction("LookCamera", throwIfNotFound: true);
m_Actionmap1_Fire1orMouseleft = m_Actionmap1.FindAction("Fire1 or Mouse left", throwIfNotFound: true);
m_Actionmap1_Camerazoom = m_Actionmap1.FindAction("Camerazoom", throwIfNotFound: true);
+ m_Actionmap1_Cancel = m_Actionmap1.FindAction("Cancel", throwIfNotFound: true);
+ m_Actionmap1_ToolMode = m_Actionmap1.FindAction("ToolMode", throwIfNotFound: true);
+ m_Actionmap1_MathMode = m_Actionmap1.FindAction("MathMode", 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);
@@ -1236,6 +1310,9 @@ public int FindBinding(InputBinding bindingMask, out InputAction action)
private readonly InputAction m_Actionmap1_LookCamera;
private readonly InputAction m_Actionmap1_Fire1orMouseleft;
private readonly InputAction m_Actionmap1_Camerazoom;
+ private readonly InputAction m_Actionmap1_Cancel;
+ private readonly InputAction m_Actionmap1_ToolMode;
+ private readonly InputAction m_Actionmap1_MathMode;
public struct Actionmap1Actions
{
private @ControlMapping m_Wrapper;
@@ -1244,6 +1321,9 @@ public struct Actionmap1Actions
public InputAction @LookCamera => m_Wrapper.m_Actionmap1_LookCamera;
public InputAction @Fire1orMouseleft => m_Wrapper.m_Actionmap1_Fire1orMouseleft;
public InputAction @Camerazoom => m_Wrapper.m_Actionmap1_Camerazoom;
+ public InputAction @Cancel => m_Wrapper.m_Actionmap1_Cancel;
+ public InputAction @ToolMode => m_Wrapper.m_Actionmap1_ToolMode;
+ public InputAction @MathMode => m_Wrapper.m_Actionmap1_MathMode;
public InputActionMap Get() { return m_Wrapper.m_Actionmap1; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
@@ -1265,6 +1345,15 @@ public void SetCallbacks(IActionmap1Actions instance)
@Camerazoom.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCamerazoom;
@Camerazoom.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCamerazoom;
@Camerazoom.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCamerazoom;
+ @Cancel.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel;
+ @Cancel.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel;
+ @Cancel.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel;
+ @ToolMode.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnToolMode;
+ @ToolMode.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnToolMode;
+ @ToolMode.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnToolMode;
+ @MathMode.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnMathMode;
+ @MathMode.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnMathMode;
+ @MathMode.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnMathMode;
}
m_Wrapper.m_Actionmap1ActionsCallbackInterface = instance;
if (instance != null)
@@ -1281,6 +1370,15 @@ public void SetCallbacks(IActionmap1Actions instance)
@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;
}
}
}
@@ -1482,6 +1580,9 @@ public interface IActionmap1Actions
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);
}
public interface IActnmp_HC_BttnActions
{
diff --git a/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions b/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions
index 7d556622c22249a1f09ecd0e10a1efbc64772c58..a300cd4b73e22721990146c30adb52db59e232be 100644
--- a/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions
+++ b/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions
@@ -7,19 +7,21 @@
"actions": [
{
"name": "Movement",
- "type": "Value",
+ "type": "PassThrough",
"id": "f1c2c6f3-2542-45df-8f4e-7660f5fe7215",
"expectedControlType": "Vector2",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "LookCamera",
- "type": "Value",
+ "type": "PassThrough",
"id": "c189c0be-0f75-45a9-94b3-d0dd52a2af19",
"expectedControlType": "Vector2",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": true
},
{
"name": "Fire1 or Mouse left",
@@ -27,7 +29,8 @@
"id": "25f93509-8bb3-4fe7-9ce3-a1b44d6a0c6c",
"expectedControlType": "Button",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "Camerazoom",
@@ -35,7 +38,35 @@
"id": "d6845352-d792-4cfe-9c8d-ab09637d4ab1",
"expectedControlType": "Button",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "Cancel",
+ "type": "Button",
+ "id": "d5aafbfd-31bc-402e-89dc-c21c91212bbc",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "ToolMode",
+ "type": "Button",
+ "id": "55269451-4704-48a9-8528-ca0d3b495ab2",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
+ },
+ {
+ "name": "MathMode",
+ "type": "Button",
+ "id": "f79249da-97b2-4a72-b594-aa21e58472a9",
+ "expectedControlType": "Button",
+ "processors": "",
+ "interactions": "",
+ "initialStateCheck": false
}
],
"bindings": [
@@ -205,59 +236,15 @@
"isPartOfComposite": true
},
{
- "name": "2D Vector",
- "id": "d4170212-8606-46f7-94be-9a9ff4a741a8",
- "path": "2DVector",
- "interactions": "",
- "processors": "",
- "groups": "",
- "action": "LookCamera",
- "isComposite": true,
- "isPartOfComposite": false
- },
- {
- "name": "up",
- "id": "5d6c453d-e001-480e-a604-953e77642d6c",
- "path": "<Keyboard>/numpad3",
- "interactions": "",
- "processors": "",
- "groups": "Keyboard",
- "action": "LookCamera",
- "isComposite": false,
- "isPartOfComposite": true
- },
- {
- "name": "down",
- "id": "97c3ed7d-c04a-4f94-b639-0fc28808557d",
- "path": "<Keyboard>/numpad1",
- "interactions": "",
- "processors": "",
- "groups": "Keyboard",
- "action": "LookCamera",
- "isComposite": false,
- "isPartOfComposite": true
- },
- {
- "name": "left",
- "id": "678190c9-2651-42f0-9645-57e650c66c1e",
- "path": "<Keyboard>/numpad7",
- "interactions": "",
- "processors": "",
- "groups": "Keyboard",
- "action": "LookCamera",
- "isComposite": false,
- "isPartOfComposite": true
- },
- {
- "name": "right",
- "id": "d22fd6f5-e74c-4d44-8b78-c2b37fc1fb20",
- "path": "<Keyboard>/numpad9",
+ "name": "",
+ "id": "74b23070-b002-405d-880f-612ed4af5d02",
+ "path": "<Mouse>/delta",
"interactions": "",
"processors": "",
- "groups": "Keyboard",
+ "groups": "KeyboardMouse",
"action": "LookCamera",
"isComposite": false,
- "isPartOfComposite": true
+ "isPartOfComposite": false
},
{
"name": "",
@@ -346,6 +333,94 @@
"action": "Camerazoom",
"isComposite": false,
"isPartOfComposite": false
+ },
+ {
+ "name": "2D Vector",
+ "id": "decbe076-f3ef-4110-8971-21b6ee602241",
+ "path": "2DVector",
+ "interactions": "",
+ "processors": "",
+ "groups": "",
+ "action": "LookCamera",
+ "isComposite": true,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "up",
+ "id": "7d56a2a0-5950-4aa1-898e-32855d5f7256",
+ "path": "<Keyboard>/numpad3",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard",
+ "action": "LookCamera",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "down",
+ "id": "a24afabd-506f-4388-87eb-33cfbaaaa35d",
+ "path": "<Keyboard>/numpad1",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard",
+ "action": "LookCamera",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "left",
+ "id": "69383c90-a869-4729-a411-59df74ef0f39",
+ "path": "<Keyboard>/numpad7",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard",
+ "action": "LookCamera",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "right",
+ "id": "37505022-8b8d-4d6a-80b1-55712e986989",
+ "path": "<Keyboard>/numpad9",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard",
+ "action": "LookCamera",
+ "isComposite": false,
+ "isPartOfComposite": true
+ },
+ {
+ "name": "",
+ "id": "737cc53a-9e90-4fc4-b809-b0a203eaffd6",
+ "path": "*/{Cancel}",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "Cancel",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "9b7bf0e3-7480-4381-bee8-9c3bcc373bf6",
+ "path": "<Keyboard>/e",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "ToolMode",
+ "isComposite": false,
+ "isPartOfComposite": false
+ },
+ {
+ "name": "",
+ "id": "d4c7df8f-769c-4d15-a143-815f5c86b485",
+ "path": "<Keyboard>/tab",
+ "interactions": "",
+ "processors": "",
+ "groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
+ "action": "MathMode",
+ "isComposite": false,
+ "isPartOfComposite": false
}
]
},
@@ -359,7 +434,8 @@
"id": "96b5cec0-5b2c-40af-9187-aa9025e85924",
"expectedControlType": "Vector2",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": true
},
{
"name": "LookCamera",
@@ -367,7 +443,8 @@
"id": "ba69a09b-82ef-41b4-ada5-68abbd4497eb",
"expectedControlType": "Vector2",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": true
}
],
"bindings": [
@@ -548,7 +625,8 @@
"id": "4b630cad-55a6-4f6c-bd0d-15057bbc7647",
"expectedControlType": "Vector2",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": true
},
{
"name": "Submit",
@@ -556,7 +634,8 @@
"id": "5976835c-e3ae-44f3-9715-546e6263f671",
"expectedControlType": "Button",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "Cancel",
@@ -564,7 +643,8 @@
"id": "e5255dc5-07f6-47b3-ba9f-2e2efb607780",
"expectedControlType": "Button",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "Point",
@@ -572,7 +652,8 @@
"id": "d71f7f6e-532d-49cf-bf0f-5f04773eeeee",
"expectedControlType": "Vector2",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "Click",
@@ -580,7 +661,8 @@
"id": "cab8ec17-6f02-42fe-9109-be000f8d6e43",
"expectedControlType": "Button",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "ScrollWheel",
@@ -588,7 +670,8 @@
"id": "6176d09c-a247-4fba-b3bc-b4dd47a50cdc",
"expectedControlType": "Vector2",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "MiddleClick",
@@ -596,7 +679,8 @@
"id": "13fcdbc5-4169-4a8d-bcf1-3f0fa7d8d9a4",
"expectedControlType": "",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "RightClick",
@@ -604,7 +688,8 @@
"id": "212e4290-34e2-4af5-8592-019975ac57a3",
"expectedControlType": "",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "TrackedDevicePosition",
@@ -612,7 +697,8 @@
"id": "a92a45a8-19dc-4e44-9675-ae257f384fb4",
"expectedControlType": "Vector3",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
},
{
"name": "TrackedDeviceOrientation",
@@ -620,7 +706,8 @@
"id": "9fd2707b-e83e-4315-8730-e43d10900229",
"expectedControlType": "Quaternion",
"processors": "",
- "interactions": ""
+ "interactions": "",
+ "initialStateCheck": false
}
],
"bindings": [
diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs
index 62e826151395321d7b053e55c47ece95babb6d31..f478ae7541be8e9c46428908901fec814f3049c4 100644
--- a/Assets/Scripts/UI/UIconfig.cs
+++ b/Assets/Scripts/UI/UIconfig.cs
@@ -15,6 +15,7 @@ public static class UIconfig
public static float[,] DPAD = new float[2, 4] { { 0, 0,0,0 }, { 0, 0, 0, 0 } } ; //Movement, Camera //Up, Down, Left, Right//
public static bool localServerWithAdditionalWindow = true;
+
//How to handle the waitTime to start ToolModeSelector
@@ -59,6 +60,10 @@ public static class UIconfig
public static double colliderScale_Mobile_default = 4;
public static double[] colliderScale_Obj_array = new double[10] { 0, 0.5, 0, 0, 0, 0, 0, 0, 0, 0 }; //id 1=tree,
+ 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 class NetworkJSON
{
public string lastIP;
@@ -76,7 +81,8 @@ public class NetworkJSON
public int InputManagerVersion;
public double colliderScale_all;
public double cursorSize;
-
+ public float camRotatingSensitivity; //Sensitivity to inputs.
+
}
//INPUTMANAGER KEY BINDINGS LIST for display Purpose
diff --git a/Assets/Stages/TechDemo B.JSON b/Assets/Stages/TechDemo B.JSON
index fb62ee2526b6a2d15e3b58d41e7d999ba21652cb..93dca637ef60dc021e2b09a39ded027157a7cf80 100644
--- a/Assets/Stages/TechDemo B.JSON
+++ b/Assets/Stages/TechDemo B.JSON
@@ -1 +1 @@
-{"category":"Demo Category","number":0,"name":"TechDemo B","description":"River Stage","scene":"RiverWorld","use_install_folder":true,"hierarchie":[],"player_record_list":{},"player_record":{"solved":false,"date":-8585450840412060476,"seconds":0.0,"name":"TechDemo B_save"}}
\ No newline at end of file
+{"category":"Demo Category","number":0,"name":"TechDemo B","description":"River Stage","scene":"RiverWorld","use_install_folder":true,"hierarchie":[],"player_record_list":{},"player_record":{}}
\ No newline at end of file
diff --git a/Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON b/Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON
index 106754fb2e41a53a144bd2ff92cdcf3172613416..158ef3dbab977c624865eb75a92dcbb216cd550d 100644
--- a/Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON
+++ b/Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON
@@ -1 +1 @@
-{"PointFacts":[{"Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact205","Label":"A","hasCustomLabel":false,"LabelId":1},{"Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact206","Label":"B","hasCustomLabel":false,"LabelId":2}],"LineFacts":[{"Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact205","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact206","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207","Label":"[AB]","hasCustomLabel":false,"LabelId":0}],"RayFacts":[],"OnLineFacts":[],"AngleFacts":[],"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact205":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact206":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact205","samestep":false,"steplink":3,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact206","samestep":true,"steplink":0,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207","samestep":true,"steplink":0,"creation":true}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":2,"UnusedLabelIds":[]}
\ No newline at end of file
+{"PointFacts":[{"Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","Label":"A","hasCustomLabel":false,"LabelId":1},{"Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","Label":"B","hasCustomLabel":false,"LabelId":2}],"LineFacts":[{"Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","Pid2":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151","Label":"[AB]","hasCustomLabel":false,"LabelId":0}],"RayFacts":[],"OnLineFacts":[],"AngleFacts":[],"MetaInf":{"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","samestep":false,"steplink":3,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","samestep":true,"steplink":0,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151","samestep":true,"steplink":0,"creation":true}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":2,"UnusedLabelIds":[]}
\ No newline at end of file
diff --git a/Assets/Stages/ValidationSets/TechDemo B_val.JSON b/Assets/Stages/ValidationSets/TechDemo B_val.JSON
index 3799ba23639b9579b43d4e040819c6805f7bf937..f620ff128b57ffa6a7cc6bc449ae4de6927122d5 100644
--- a/Assets/Stages/ValidationSets/TechDemo B_val.JSON
+++ b/Assets/Stages/ValidationSets/TechDemo B_val.JSON
@@ -1 +1 @@
-[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact207"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}]
\ No newline at end of file
+[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Config/Network.JSON b/Assets/StreamingAssets/Config/Network.JSON
index 3e9b8406a06048695d908b4431177a4cdf3f6216..b3c7951fd1ffce10416087ab17a9295384d4ed5c 100644
--- a/Assets/StreamingAssets/Config/Network.JSON
+++ b/Assets/StreamingAssets/Config/Network.JSON
@@ -13,5 +13,6 @@
"FrameITUIversion":"2",
"InputManagerVersion":"1",
"colliderScale_all":"1.2",
- "cursorSize":"0.03125"
+ "cursorSize":"0.03125",
+ "camRotatingSensitivity":"2f"
}
diff --git a/GAMEGUIDE.md b/GAMEGUIDE.md
index 2e0bdba99e475d28ada83af6423c0d4d81f9af62..5420394e35700492e1fdb4d08861b4d9403e83e8 100644
--- a/GAMEGUIDE.md
+++ b/GAMEGUIDE.md
@@ -1,15 +1,16 @@
-# UFrameIT
+# UFrameIT
-## What Quests are there
-1. Tree Stage
-1.1. On map Tree Stage, measure the Height of the Tree near the villager.
-2. River Stage
+## A1 What Quests are there
+
+1. Tree Stage
+1.1. On map Tree Stage, measure the Height of the Tree near the villager.
+2. River Stage
2.1. On map River Stage, measure the Height of the Tree near the villager.
-## what Gameplay modes are there
+## A2 what Gameplay modes are there
1. First Person Gameplay
2. Third Person Gameplay
3. Escaperoom Gameplay
@@ -17,43 +18,43 @@
### 1.1 First person gameplay
-- first person perspective
-- compatible with (old) Input Manager
-- compatible with (new) Input System Package
-- supports FrameITUI
-- supports FrameITUI_mobile
+ - first person perspective
+ - compatible with (old) Input Manager
+ - compatible with (new) Input System Package
+ - supports FrameITUI
+ - supports FrameITUI_mobile
### 1.2 First person gameplay (old mainplayer version)
-- first person perspective
-- compatible with (old) Input Manager
-- uses FrameITUI --> no Touchinput supported
+ - first person perspective
+ - compatible with (old) Input Manager
+ - uses FrameITUI --> no Touchinput supported
### 2.1 Gameplay with Camera right behind shoulder
-- third person perspective
-- player controls camera, which controls direct the playermodel
+ - third person perspective
+ - player controls camera, which controls direct the playermodel
### 2.2 Third Person Gameplay with dampened Camera
-- third person perspective
-- player controls Playermodel and the camera follows and rotates in a smoothed behavior.
+ - third person perspective
+ - player controls Playermodel and the camera follows and rotates in a smoothed behavior.
### 2.3 Third Person Gameplay with manual Camera (For example Birdview)
-- third person perspective
-- player controls Playermodel and the camera follows without rotating behavior.
+ - third person perspective
+ - player controls Playermodel and the camera follows without rotating behavior.
### 3.1 Escaperoom Gameplay
-- Fixed Camera
+ - Fixed Camera
### 4.1 Sidescroller Gameplay
-- Only 2D Walking.
+ - Only 2D Walking.
### How to set Options for Missions
-## what options do:
+## A3 what options do:
### Control Options:
@@ -70,6 +71,26 @@
#### Keyboard Mouse Options
- Look up or change Bindings
+ - New Input System uses: "ControlMapping" --> "Actionmap1":
+ - Movement Forward: up, w
+ - Movement Backward: down, s
+ - Movement Left: left, a
+ - Movement Right: right, d
+ - Movement Running: left_shift
+ - Movement Jump: space
+ - Action 1: LeftMouseBttn
+ - Action 2: RightMouseBttn
+ - Change Tool: MouseScrollWheel
+ - Menue Tools: e
+ - Menue Mathematics: tab
+ - Menue Cancel: escape
+ - Command Load: m+l
+ - Command Save: m+s
+ - Command Reset: m+backspace
+ - Command Undo: m+u
+ - Command Redo: m+r
+
+
#### Touch-control Options
- choose the Touch-Control mode you want to use
@@ -100,7 +121,7 @@
- Supports Touch-Controls
### Reset Options:
- - Following Reset Operations are handled by the Streaming AssetLoader.cs
+- Following Reset Operations are handled by the Streaming AssetLoader.cs
#### Reset Configurations
- Reloads files from Assets/StreamingsAssets to Application.persistentDataPath/Config/Network.JSON
@@ -115,6 +136,10 @@
### Gameplay Options:
+#### Set Sensitivity of Camera
+ - saved in Application.persistentDataPath/Config/Network.JSON
+ - (relevant for using FirstPerson Camera)
+
#### Resize Cursor
- saved in Application.persistentDataPath/Config/Network.JSON
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 463e25abbe28dea578582e6a77cf800d7f19b363..2e45b1b45b8a0798bacaf86cddecb7a92cdeed98 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;MOBILE_INPUT
- 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT
- 14: MOBILE_INPUT
+ 4: CROSS_PLATFORM_INPUT
+ 7: CROSS_PLATFORM_INPUT
+ 14:
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend:
diff --git a/ReadyToRunBuilds/RTR_WindowsStandalone.rar b/ReadyToRunBuilds/RTR_WindowsStandalone.rar
deleted file mode 100644
index 754d59863a0b2c914a13842385dd472569943e3d..0000000000000000000000000000000000000000
Binary files a/ReadyToRunBuilds/RTR_WindowsStandalone.rar and /dev/null differ