Skip to content
Snippets Groups Projects
Commit 2d4694cb authored by Stefan Richter's avatar Stefan Richter
Browse files

mergeTest

parents a4008a5c 0be683e0
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 11195 additions and 10146 deletions
Assets/InputSystem.inputsettings.asset
+ 10
− 1
View file @ 2d4694cb
......@@ -14,13 +14,22 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_SupportedDevices: []
m_UpdateMode: 1
m_MaxEventBytesPerUpdate: 5242880
m_MaxQueuedEventsPerUpdate: 1000
m_CompensateForScreenOrientation: 1
m_FilterNoiseOnCurrent: 0
m_BackgroundBehavior: 0
m_EditorInputBehaviorInPlayMode: 0
m_DefaultDeadzoneMin: 0.125
m_DefaultDeadzoneMax: 0.925
m_DefaultButtonPressPoint: 0.5
m_ButtonReleaseThreshold: 0.75
m_DefaultTapTime: 0.2
m_DefaultSlowTapTime: 0.5
m_DefaultHoldTime: 0.4
m_TapRadius: 5
m_MultiTapDelayTime: 0.75
m_DisableRedundantEventsMerging: 0
m_iOSSettings:
m_MotionUsage:
m_Enabled: 0
m_Description:
Assets/Resources/Prefabs/UI/Ingame/Controls.meta 0 → 100644
+ 8
− 0
View file @ 2d4694cb
fileFormatVersion: 2
guid: 17cc55f72ca23fd4f8ef9b3f46069e98
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Prefabs/UI/Ingame/Controls/Touch_MovCtrl (1).prefab 0 → 100644
+ 8238
− 0
View file @ 2d4694cb
Source diff could not be displayed: it is too large. Options to address this: view the blob.
Assets/Resources/Prefabs/UI/Ingame/Controls/Touch_MovCtrl (1).prefab.meta 0 → 100644
+ 7
− 0
View file @ 2d4694cb
fileFormatVersion: 2
guid: 6a36259218adf9c4d82396fcaa06650d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
+ 2221
− 9772
View file @ 2d4694cb
Source diff could not be displayed: it is too large. Options to address this: view the blob.
Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab
+ 1
− 1
View file @ 2d4694cb
......@@ -75,7 +75,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2464893811460590176}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
m_Name:
......
Assets/Scenes/Worlds/RiverWorld.unity
+ 208
− 198
View file @ 2d4694cb
......@@ -11970,152 +11970,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 422989643}
m_PrefabAsset: {fileID: 0}
--- !u!1 &424784665
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 424784668}
- component: {fileID: 424784667}
- component: {fileID: 424784669}
- component: {fileID: 424784666}
- component: {fileID: 424784670}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &424784666
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: 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 &424784667
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 424784665}
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 &424784668
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 424784665}
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: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &424784669
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 424784665}
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 &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
......@@ -13661,6 +13515,43 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 522176086}
m_PrefabAsset: {fileID: 0}
--- !u!1 &522389322 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4982402009794970575, guid: b07552db700124a4680401e6fb94c186,
type: 3}
m_PrefabInstance: {fileID: 3020720018843181009}
m_PrefabAsset: {fileID: 0}
--- !u!114 &522389329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 522389322}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: c67c429830e750846928f3ce8ff01c52,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Actionmap1
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!1001 &532703358
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -26288,7 +26179,7 @@ PrefabInstance:
- target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
type: 3}
......@@ -26380,6 +26271,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4562596043252269475, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5414632706773564122, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e, type: 3}
--- !u!1001 &1179177042
......@@ -32010,6 +31911,26 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1488704536}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1494173591 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 552285902974582849, guid: b07552db700124a4680401e6fb94c186,
type: 3}
m_PrefabInstance: {fileID: 3020720018843181009}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1494173597
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1494173591}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d677f1681015749b15c436eec6d880, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MovementRange: 50
m_ControlPath: <Gamepad>/leftStick
--- !u!1001 &1494877857
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -58361,6 +58282,11 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 185361735184545063, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 251852623843673086, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Name
......@@ -58466,16 +58392,31 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 606112619625875984, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 683808477753892930, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: ignoreLayerMask.m_Bits
value: 96770
objectReference: {fileID: 0}
- target: {fileID: 695734973786364499, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 759242526881448230, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 850821517166855815, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1306529574817530029, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
......@@ -58581,6 +58522,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1767970667048016502, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1768374258906171685, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_RootOrder
......@@ -58616,6 +58562,11 @@ PrefabInstance:
propertyPath: ignoreLayerMask.m_Bits
value: 96770
objectReference: {fileID: 0}
- target: {fileID: 2089492841515589082, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2298808608097309639, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -58646,6 +58597,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2647467706486682715, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664944418306431975, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -58756,11 +58712,21 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2922756910265347783, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2924349225620263925, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2952061370703835237, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3018693875623148968, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_RootOrder
......@@ -59186,11 +59152,21 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -18.5
objectReference: {fileID: 0}
- target: {fileID: 3159534690643555782, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3181580858769597177, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3219932812762137119, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3251676094212896845, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.y
......@@ -59231,6 +59207,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3429090558935818049, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3464836784535376508, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: ignoreLayerMask.m_Bits
......@@ -59261,6 +59242,11 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3800846218600177375, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3896946106420822580, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
......@@ -59281,11 +59267,26 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013349997164975766, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4100577221128762102, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4398823469594704638, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 1.2522583
objectReference: {fileID: 0}
- target: {fileID: 4452086575853159098, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528706156938173836, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
......@@ -59296,6 +59297,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4630744487396776836, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4735967709580508106, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4766761678399815156, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalPosition.y
......@@ -59381,6 +59392,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5251855878285085049, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5271626897556190298, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
......@@ -59501,6 +59517,11 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: -0.000000026716922
objectReference: {fileID: 0}
- target: {fileID: 5917126301766026879, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5927928908429282872, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_RootOrder
......@@ -59606,6 +59627,11 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6428599771922279781, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6435737915428484329, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalRotation.w
......@@ -59646,6 +59672,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6613386903020756613, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6624912496599313919, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchoredPosition.y
......@@ -59701,6 +59732,11 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: -0.000000013358464
objectReference: {fileID: 0}
- target: {fileID: 6849629549808862850, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6924550525685015804, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
......@@ -59716,6 +59752,11 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6955052406147907277, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6981642935568223106, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -59771,6 +59812,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7127540210087259445, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7192287966175771441, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_Name
......@@ -59926,11 +59972,21 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7869052720085202278, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7881358329405108412, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7943856404848092595, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8026218278173259666, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.x
......@@ -59946,6 +60002,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8077970422851001925, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8096800381433475267, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.x
......@@ -60103,54 +60164,3 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b07552db700124a4680401e6fb94c186, type: 3}
--- !u!1 &3020720018843181010 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4002928967850016478, guid: b07552db700124a4680401e6fb94c186,
type: 3}
m_PrefabInstance: {fileID: 3020720018843181009}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3020720018843181011
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3020720018843181010}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: c67c429830e750846928f3ce8ff01c52,
type: 3}
m_NotificationBehavior: 0
m_UIInputModule: {fileID: 424784666}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents: []
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Actionmap1
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &3020720018843181013
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3020720018843181010}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d677f1681015749b15c436eec6d880, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MovementRange: 50
m_ControlPath: <AndroidGamepad>/leftStick
Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
+ 71
− 20
View file @ 2d4694cb
......@@ -59,12 +59,20 @@ private void Awake()
input_ControlMapping = new ControlMapping();
input_ControlMapping.Actionmap1.Movement.Enable();
input_ControlMapping.Actnmp_HC.Movement.Enable();
input_ControlMapping.Actnmp_HC.Move_Left.Enable();
input_ControlMapping.Actnmp_HC.Move_Right.Enable();
input_ControlMapping.Actnmp_HC.Move_Forward.Enable();
input_ControlMapping.Actnmp_HC.Move_Backwards.Enable();
}
private void OnEnable()
{
input_ControlMapping.Actionmap1.Movement.Enable();
input_ControlMapping.Actnmp_HC.Movement.Enable();
input_ControlMapping.Actnmp_HC.Move_Left.Enable();
input_ControlMapping.Actnmp_HC.Move_Right.Enable();
input_ControlMapping.Actnmp_HC.Move_Forward.Enable();
input_ControlMapping.Actnmp_HC.Move_Backwards.Enable();
//NPC1.setPlayer(gameObject);
}
......@@ -73,6 +81,10 @@ private void OnDisable()
{
input_ControlMapping.Actionmap1.Movement.Disable();
input_ControlMapping.Actnmp_HC.Movement.Disable();
input_ControlMapping.Actnmp_HC.Move_Left.Disable();
input_ControlMapping.Actnmp_HC.Move_Right.Disable();
input_ControlMapping.Actnmp_HC.Move_Forward.Disable();
input_ControlMapping.Actnmp_HC.Move_Backwards.Disable();
}
......@@ -280,39 +292,56 @@ private void GetInput(out float speed)
}
if (UIconfig.InputManagerVersion == 2)
{
Vector2 a;
Vector2 a = Vector2.zero;
if (CommunicationEvents.Opsys == 1)
{
switch (UIconfig.touchControlMode)
{
case 0:
break;
case 1:
//vertical = ButtonsToAxe(input_ControlMapping.Actnmp_HC.Move_Left.ReadValue<float>(), input_ControlMapping.Actnmp_HC.Move_Right.ReadValue<float>());
//horizontal = ButtonsToAxe(input_ControlMapping.Actnmp_HC.Move_Forward.ReadValue<float>(), input_ControlMapping.Actnmp_HC.Move_Backwards.ReadValue<float>());
vertical = input_ControlMapping.Actnmp_HC.Move_Forward.ReadValue<float>();
horizontal = 0;
m_Input = new Vector2(horizontal, vertical);
break;
case 2:
a = input_ControlMapping.Actnmp_HC.Movement.ReadValue<Vector2>();
break;
case 3:
a = input_ControlMapping.Actnmp_HC.Movement.ReadValue<Vector2>();
break;
default:
a = input_ControlMapping.Actnmp_HC.Movement.ReadValue<Vector2>();
break;
}
}
else
{
a = input_ControlMapping.Actionmap1.Movement.ReadValue<Vector2>();
}
m_Input = a;
}
if (UIconfig.InputManagerVersion == 3)
{
m_Input = a;
if (DPAD[0, 1] != 0) { vertical = DPAD[0, 1]; }
if (DPAD[0, 0] != 0) { vertical = DPAD[0, 0]; }
if (DPAD[0,0]!=0 && DPAD[0,1]!=0)
{
vertical = 0;
}
if (DPAD[0, 3] != 0) { horizontal = DPAD[0, 3]; }
if (DPAD[0, 2] != 0) { horizontal = DPAD[0, 2]; }
if (DPAD[0, 2] != 0 && DPAD[0, 3] != 0)
if (UIconfig.InputManagerVersion == 3)
{
horizontal = 0;
}
vertical = ButtonsToAxe(DPAD[0, 1], DPAD[0, 0]);
horizontal = ButtonsToAxe(DPAD[0, 3], DPAD[0, 2]);
m_Input = new Vector2(horizontal, vertical);
......@@ -367,5 +396,27 @@ private void OnControllerColliderHit(ControllerColliderHit hit)
}
body.AddForceAtPosition(m_CharacterController.velocity * 0.1f, hit.point, ForceMode.Impulse);
}
public float ButtonsToAxe(float up, float down)
{
float axe=0;
if (up != 0) { axe = up; }
if (down != 0) { axe = down; }
if (down != 0 && up != 0)
{
axe = 0;
}
return axe;
}
}
}
Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
+ 35
− 30
View file @ 2d4694cb
......@@ -55,7 +55,7 @@ public void LookRotation(Transform character, Transform camera)
{
XSensitivity = UIconfig.camRotatingSensitivity;
YSensitivity = XSensitivity;
Vector2 a=Vector2.zero;
float yRot=0;
float xRot=0;
......@@ -63,33 +63,26 @@ public void LookRotation(Transform character, Transform camera)
if (UIconfig.InputManagerVersion == 1)
{
// Read input
yRot = CrossPlatformInputManager.GetAxis("Mouse X") * XSensitivity;
xRot = CrossPlatformInputManager.GetAxis("Mouse Y") * YSensitivity;
a.x = CrossPlatformInputManager.GetAxis("Mouse X") ;
a.y = CrossPlatformInputManager.GetAxis("Mouse Y") ;
}
if (UIconfig.InputManagerVersion == 2)
{
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>();
//yRot = 100* YSensitivity * input_ControlMapping.Actionmap1.MouseY.ReadValue<float>();
......@@ -99,28 +92,22 @@ public void LookRotation(Transform character, Transform camera)
// Read input
yRot = yRot * XSensitivity;
xRot = xRot * YSensitivity;
if (DPAD[1, 1] != 0) { xRot = DPAD[1, 1]; }
if (DPAD[1, 0] != 0) { xRot = DPAD[1, 0]; }
a.y = ButtonsToAxe(DPAD[1, 1], DPAD[1, 0]);
a.x = ButtonsToAxe(DPAD[1, 3], DPAD[1, 2]);
if (DPAD[1, 0] != 0 && DPAD[1, 1] != 0)
{
xRot = 0;
}
if (DPAD[1, 3] != 0) { yRot = DPAD[1, 3]; }
if (DPAD[1, 2] != 0) { yRot = DPAD[1, 2]; }
if (DPAD[1, 2] != 0 && DPAD[1, 3] != 0)
{
yRot = 0;
}
yRot = yRot * XSensitivity;
xRot = xRot * YSensitivity;
}
if (a.sqrMagnitude > 1)
{
a.Normalize();
}
//xRot = 1;
yRot = a.x * XSensitivity;
xRot = a.y * YSensitivity;
m_CharacterTargetRot *= Quaternion.Euler(0f, yRot, 0f);
......@@ -203,5 +190,23 @@ Quaternion ClampRotationAroundXAxis(Quaternion q)
return q;
}
public float ButtonsToAxe(float up, float down)
{
float axe = 0;
if (up != 0) { axe = up; }
if (down != 0) { axe = down; }
if (down != 0 && up != 0)
{
axe = 0;
}
return axe;
}
}
}
Assets/Scripts/UI/InGame/EventsystemMode_Ctrl.cs
+ 10
− 5
View file @ 2d4694cb
......@@ -37,7 +37,12 @@ void Start()
private void Update()
{
/*
Update3();
*/
}
private void Update3()
{
if (GpMode_before != UIconfig.InputManagerVersion)
{
Update2();
......@@ -49,9 +54,9 @@ private void Update()
Update2();
}
}
private void Update2(){
......
Assets/Scripts/UI/InGame/IngameUI_OnOffButton_mobile.cs
+ 12
− 6
View file @ 2d4694cb
......@@ -20,11 +20,12 @@ public class IngameUI_OnOffButton_mobile : MonoBehaviour, IPointerDownHandler, I
public int myUI_ID;
public int setValueTo;
//public bool simulateKey;
private bool checkedA = false;
void Start()
{
checkedA= CheckArray();
}
......@@ -40,21 +41,26 @@ private bool CheckArray()
return true;
}
return false;
}
public void OnPointerDown(PointerEventData data)
{
if (checkedA)
{
UIconfig.CanvasOnOff_Array[myUI_ID] = setValueTo;
}
else
{
Debug.Log( "Out of Array Length");
}
}
public void OnPointerUp(PointerEventData data)
{
if (CheckArray())
{
UIconfig.CanvasOnOff_Array[myUI_ID] = setValueTo;
}
}
}
\ No newline at end of file
Assets/Scripts/UI/InGame/IngameUI_OnOff_TouchControlMode.cs
+ 1
− 1
View file @ 2d4694cb
......@@ -61,7 +61,7 @@ private bool CheckArray()
/// <summary>
/// Deactivates all Pages.
/// Activates all Pages.
/// </summary>
private void ActivateUIC()
{
......
Assets/Scripts/UI/InGame/IngameUI_OnOff_mobile.cs
+ 4
− 2
View file @ 2d4694cb
......@@ -19,6 +19,7 @@ public class IngameUI_OnOff_mobile : MonoBehaviour
public int myUI_ID;
public int default_value;
private bool cA;
private int lasttime=-99;
void Start()
......@@ -37,7 +38,7 @@ void Start()
private void Update()
{
if (cA)
if (cA && lasttime!= UIconfig.CanvasOnOff_Array[myUI_ID])
{
switch (UIconfig.CanvasOnOff_Array[myUI_ID])
{
......@@ -58,6 +59,7 @@ private void Update()
ClearUIC();
break;
}
lasttime = UIconfig.CanvasOnOff_Array[myUI_ID];
}
}
......
Assets/Scripts/UI/InGame/UI_OnOff_InputModule.cs 0 → 100644
+ 77
− 0
View file @ 2d4694cb
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI; //andr
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;
public class UI_OnOff_InputModule : MonoBehaviour
{
public GameObject myself_GObj;
public int myInputModule_ID;
//public int default_value;
private bool cA=true;
private int before = -99;
void Start()
{
}
private void Update()
{
if (cA && before!= UIconfig.InputManagerVersion)
{
if (UIconfig.InputManagerVersion==myInputModule_ID)
{
ActivateUIC();
}
else
{
ClearUIC();
}
before = UIconfig.InputManagerVersion;
}
}
/// <summary>
/// Activates all Pages.
/// </summary>
private void ActivateUIC()
{
for (int i = 0; i < myself_GObj.transform.childCount; i++)
{
myself_GObj.transform.GetChild(i).gameObject.SetActive(true);
}
}
/// <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
Assets/Scripts/UI/InGame/UI_OnOff_InputModule.cs.meta 0 → 100644
+ 11
− 0
View file @ 2d4694cb
fileFormatVersion: 2
guid: adb274d5133f4fe488bee25e95fc502d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/UI/PlayerControls/ControlMapping.cs
+ 160
− 54
View file @ 2d4694cb
......@@ -770,64 +770,54 @@ public @ControlMapping()
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
}
],
""bindings"": [
},
{
""name"": ""2D Vector _2"",
""id"": ""b0536072-086c-4637-96cc-81242942834d"",
""path"": ""2DVector"",
""interactions"": """",
""name"": ""Move_Forward"",
""type"": ""Button"",
""id"": ""6f31c4f0-894c-45ae-b423-ec5f991b6fe9"",
""expectedControlType"": ""Button"",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""up"",
""id"": ""7b6a695c-298f-4154-bbe8-135a863d3413"",
""path"": ""<Keyboard>/w"",
""interactions"": """",
""name"": ""Move_Left"",
""type"": ""Button"",
""id"": ""9183b486-fb57-495c-96aa-75d13cd32b3d"",
""expectedControlType"": ""Button"",
""processors"": """",
""groups"": ""KeyboardMouse;Keyboard;test;Android;Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""down"",
""id"": ""e68dd331-d7ad-4289-9f8e-70e73c0e8904"",
""path"": ""<Keyboard>/s"",
""interactions"": """",
""name"": ""Move_Backwards"",
""type"": ""Button"",
""id"": ""3470df69-8f20-4bdb-b81f-e084c8c3803f"",
""expectedControlType"": ""Button"",
""processors"": """",
""groups"": ""KeyboardMouse;Keyboard;test;Android;Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""left"",
""id"": ""1b47c1f7-c2f0-4d21-b113-0979196f4de1"",
""path"": ""<Keyboard>/a"",
""interactions"": """",
""name"": ""Move_Right"",
""type"": ""Button"",
""id"": ""9f06c49c-8222-47c1-a4a1-091438114316"",
""expectedControlType"": ""Button"",
""processors"": """",
""groups"": ""KeyboardMouse;Keyboard;Gamepad;Android;test"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""right"",
""id"": ""808510ba-5d75-421b-a1f0-f3e714fdb612"",
""path"": ""<Keyboard>/d"",
""interactions"": """",
""name"": ""New action"",
""type"": ""Value"",
""id"": ""53f4d1a6-365b-4ddc-8cf9-31058c0f8a49"",
""expectedControlType"": ""Vector3"",
""processors"": """",
""groups"": ""KeyboardMouse;Keyboard;Gamepad;Android;test"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
""interactions"": """",
""initialStateCheck"": true
}
],
""bindings"": [
{
""name"": ""2D Vector"",
""id"": ""8a745d1e-af1b-4a19-831e-14013fcbe9bd"",
......@@ -845,7 +835,7 @@ public @ControlMapping()
""path"": ""<Gamepad>/leftStick/up"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
""groups"": """",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
......@@ -856,7 +846,7 @@ public @ControlMapping()
""path"": ""<Gamepad>/leftStick/down"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
""groups"": """",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
......@@ -864,10 +854,10 @@ public @ControlMapping()
{
""name"": ""left"",
""id"": ""4a36e1ed-5df3-4912-9bd8-4f110958f5c7"",
""path"": ""<AndroidGamepad>/leftStick/left"",
""path"": ""<Gamepad>/leftStick/left"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
""groups"": """",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
......@@ -911,7 +901,7 @@ public @ControlMapping()
""path"": ""<Touchscreen>/primaryTouch/tap"",
""interactions"": """",
""processors"": """",
""groups"": ""Android;KeyboardMouse;test;Gamepad;Keyboard"",
""groups"": """",
""action"": ""Fire1 or Mouse left"",
""isComposite"": false,
""isPartOfComposite"": false
......@@ -922,7 +912,7 @@ public @ControlMapping()
""path"": ""<Keyboard>/#(p)"",
""interactions"": """",
""processors"": """",
""groups"": ""KeyboardMouse;test;Android;Gamepad;Keyboard"",
""groups"": """",
""action"": ""Fire1 or Mouse left"",
""isComposite"": false,
""isPartOfComposite"": false
......@@ -944,7 +934,7 @@ public @ControlMapping()
""path"": ""<Keyboard>/n"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
""groups"": """",
""action"": ""Camerazoom"",
""isComposite"": false,
""isPartOfComposite"": true
......@@ -955,7 +945,7 @@ public @ControlMapping()
""path"": ""<Keyboard>/h"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
""groups"": """",
""action"": ""Camerazoom"",
""isComposite"": false,
""isPartOfComposite"": true
......@@ -977,7 +967,7 @@ public @ControlMapping()
""path"": ""<Mouse>/scroll"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse;KeyboardMouse;test;Gamepad;Keyboard"",
""groups"": ""Keyboard&Mouse"",
""action"": ""Camerazoom"",
""isComposite"": false,
""isPartOfComposite"": false
......@@ -1043,7 +1033,7 @@ public @ControlMapping()
""path"": ""*/{Cancel}"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard;Gamepad;Android;test;KeyboardMouse"",
""groups"": """",
""action"": ""Cancel"",
""isComposite"": false,
""isPartOfComposite"": false
......@@ -1146,6 +1136,72 @@ public @ControlMapping()
""action"": ""Redo"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""ef3bf6b0-965e-42f3-bddf-232a58b4a8fa"",
""path"": ""<Keyboard>/w"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move_Forward"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""f0e2a0cc-498f-4c61-b0d3-1857adc31bc4"",
""path"": ""<Gamepad>/leftStick/up"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move_Forward"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""ec183df0-8773-49fe-a019-cb365fa46443"",
""path"": ""<Keyboard>/a"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move_Left"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""3b5a10f6-2534-488b-b43b-36799f6f7cf4"",
""path"": ""<Keyboard>/s"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move_Backwards"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""b33bf585-71de-44bc-b8a2-7aaa822d5276"",
""path"": ""<Keyboard>/d"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move_Right"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""6146bad3-ae9d-413d-b780-4354d75b63ed"",
""path"": """",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""New action"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
......@@ -1766,6 +1822,11 @@ public @ControlMapping()
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);
m_Actnmp_HC_Move_Forward = m_Actnmp_HC.FindAction("Move_Forward", throwIfNotFound: true);
m_Actnmp_HC_Move_Left = m_Actnmp_HC.FindAction("Move_Left", throwIfNotFound: true);
m_Actnmp_HC_Move_Backwards = m_Actnmp_HC.FindAction("Move_Backwards", throwIfNotFound: true);
m_Actnmp_HC_Move_Right = m_Actnmp_HC.FindAction("Move_Right", throwIfNotFound: true);
m_Actnmp_HC_Newaction = m_Actnmp_HC.FindAction("New action", throwIfNotFound: true);
// UI
m_UI = asset.FindActionMap("UI", throwIfNotFound: true);
m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true);
......@@ -1988,6 +2049,11 @@ public void SetCallbacks(IActionmap1Actions instance)
private readonly InputAction m_Actnmp_HC_Reset;
private readonly InputAction m_Actnmp_HC_Undo;
private readonly InputAction m_Actnmp_HC_Redo;
private readonly InputAction m_Actnmp_HC_Move_Forward;
private readonly InputAction m_Actnmp_HC_Move_Left;
private readonly InputAction m_Actnmp_HC_Move_Backwards;
private readonly InputAction m_Actnmp_HC_Move_Right;
private readonly InputAction m_Actnmp_HC_Newaction;
public struct Actnmp_HCActions
{
private @ControlMapping m_Wrapper;
......@@ -2006,6 +2072,11 @@ public struct Actnmp_HCActions
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 InputAction @Move_Forward => m_Wrapper.m_Actnmp_HC_Move_Forward;
public InputAction @Move_Left => m_Wrapper.m_Actnmp_HC_Move_Left;
public InputAction @Move_Backwards => m_Wrapper.m_Actnmp_HC_Move_Backwards;
public InputAction @Move_Right => m_Wrapper.m_Actnmp_HC_Move_Right;
public InputAction @Newaction => m_Wrapper.m_Actnmp_HC_Newaction;
public InputActionMap Get() { return m_Wrapper.m_Actnmp_HC; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
......@@ -2057,6 +2128,21 @@ public void SetCallbacks(IActnmp_HCActions instance)
@Redo.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnRedo;
@Redo.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnRedo;
@Redo.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnRedo;
@Move_Forward.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Forward;
@Move_Forward.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Forward;
@Move_Forward.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Forward;
@Move_Left.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Left;
@Move_Left.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Left;
@Move_Left.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Left;
@Move_Backwards.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Backwards;
@Move_Backwards.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Backwards;
@Move_Backwards.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Backwards;
@Move_Right.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Right;
@Move_Right.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Right;
@Move_Right.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnMove_Right;
@Newaction.started -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnNewaction;
@Newaction.performed -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnNewaction;
@Newaction.canceled -= m_Wrapper.m_Actnmp_HCActionsCallbackInterface.OnNewaction;
}
m_Wrapper.m_Actnmp_HCActionsCallbackInterface = instance;
if (instance != null)
......@@ -2103,6 +2189,21 @@ public void SetCallbacks(IActnmp_HCActions instance)
@Redo.started += instance.OnRedo;
@Redo.performed += instance.OnRedo;
@Redo.canceled += instance.OnRedo;
@Move_Forward.started += instance.OnMove_Forward;
@Move_Forward.performed += instance.OnMove_Forward;
@Move_Forward.canceled += instance.OnMove_Forward;
@Move_Left.started += instance.OnMove_Left;
@Move_Left.performed += instance.OnMove_Left;
@Move_Left.canceled += instance.OnMove_Left;
@Move_Backwards.started += instance.OnMove_Backwards;
@Move_Backwards.performed += instance.OnMove_Backwards;
@Move_Backwards.canceled += instance.OnMove_Backwards;
@Move_Right.started += instance.OnMove_Right;
@Move_Right.performed += instance.OnMove_Right;
@Move_Right.canceled += instance.OnMove_Right;
@Newaction.started += instance.OnNewaction;
@Newaction.performed += instance.OnNewaction;
@Newaction.canceled += instance.OnNewaction;
}
}
}
......@@ -2290,6 +2391,11 @@ public interface IActnmp_HCActions
void OnReset(InputAction.CallbackContext context);
void OnUndo(InputAction.CallbackContext context);
void OnRedo(InputAction.CallbackContext context);
void OnMove_Forward(InputAction.CallbackContext context);
void OnMove_Left(InputAction.CallbackContext context);
void OnMove_Backwards(InputAction.CallbackContext context);
void OnMove_Right(InputAction.CallbackContext context);
void OnNewaction(InputAction.CallbackContext context);
}
public interface IUIActions
{
......
Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions
+ 110
− 54
View file @ 2d4694cb
......@@ -748,64 +748,54 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
},
{
"name": "2D Vector _2",
"id": "b0536072-086c-4637-96cc-81242942834d",
"path": "2DVector",
"interactions": "",
"name": "Move_Forward",
"type": "Button",
"id": "6f31c4f0-894c-45ae-b423-ec5f991b6fe9",
"expectedControlType": "Button",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
"interactions": "",
"initialStateCheck": false
},
{
"name": "up",
"id": "7b6a695c-298f-4154-bbe8-135a863d3413",
"path": "<Keyboard>/w",
"interactions": "",
"name": "Move_Left",
"type": "Button",
"id": "9183b486-fb57-495c-96aa-75d13cd32b3d",
"expectedControlType": "Button",
"processors": "",
"groups": "KeyboardMouse;Keyboard;test;Android;Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
"interactions": "",
"initialStateCheck": false
},
{
"name": "down",
"id": "e68dd331-d7ad-4289-9f8e-70e73c0e8904",
"path": "<Keyboard>/s",
"interactions": "",
"name": "Move_Backwards",
"type": "Button",
"id": "3470df69-8f20-4bdb-b81f-e084c8c3803f",
"expectedControlType": "Button",
"processors": "",
"groups": "KeyboardMouse;Keyboard;test;Android;Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
"interactions": "",
"initialStateCheck": false
},
{
"name": "left",
"id": "1b47c1f7-c2f0-4d21-b113-0979196f4de1",
"path": "<Keyboard>/a",
"interactions": "",
"name": "Move_Right",
"type": "Button",
"id": "9f06c49c-8222-47c1-a4a1-091438114316",
"expectedControlType": "Button",
"processors": "",
"groups": "KeyboardMouse;Keyboard;Gamepad;Android;test",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
"interactions": "",
"initialStateCheck": false
},
{
"name": "right",
"id": "808510ba-5d75-421b-a1f0-f3e714fdb612",
"path": "<Keyboard>/d",
"interactions": "",
"name": "New action",
"type": "Value",
"id": "53f4d1a6-365b-4ddc-8cf9-31058c0f8a49",
"expectedControlType": "Vector3",
"processors": "",
"groups": "KeyboardMouse;Keyboard;Gamepad;Android;test",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
"interactions": "",
"initialStateCheck": true
}
],
"bindings": [
{
"name": "2D Vector",
"id": "8a745d1e-af1b-4a19-831e-14013fcbe9bd",
......@@ -823,7 +813,7 @@
"path": "<Gamepad>/leftStick/up",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
"groups": "",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
......@@ -834,7 +824,7 @@
"path": "<Gamepad>/leftStick/down",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
"groups": "",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
......@@ -842,10 +832,10 @@
{
"name": "left",
"id": "4a36e1ed-5df3-4912-9bd8-4f110958f5c7",
"path": "<AndroidGamepad>/leftStick/left",
"path": "<Gamepad>/leftStick/left",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
"groups": "",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
......@@ -889,7 +879,7 @@
"path": "<Touchscreen>/primaryTouch/tap",
"interactions": "",
"processors": "",
"groups": "Android;KeyboardMouse;test;Gamepad;Keyboard",
"groups": "",
"action": "Fire1 or Mouse left",
"isComposite": false,
"isPartOfComposite": false
......@@ -900,7 +890,7 @@
"path": "<Keyboard>/#(p)",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse;test;Android;Gamepad;Keyboard",
"groups": "",
"action": "Fire1 or Mouse left",
"isComposite": false,
"isPartOfComposite": false
......@@ -922,7 +912,7 @@
"path": "<Keyboard>/n",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
"groups": "",
"action": "Camerazoom",
"isComposite": false,
"isPartOfComposite": true
......@@ -933,7 +923,7 @@
"path": "<Keyboard>/h",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
"groups": "",
"action": "Camerazoom",
"isComposite": false,
"isPartOfComposite": true
......@@ -955,7 +945,7 @@
"path": "<Mouse>/scroll",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse;KeyboardMouse;test;Gamepad;Keyboard",
"groups": "Keyboard&Mouse",
"action": "Camerazoom",
"isComposite": false,
"isPartOfComposite": false
......@@ -1021,7 +1011,7 @@
"path": "*/{Cancel}",
"interactions": "",
"processors": "",
"groups": "Keyboard;Gamepad;Android;test;KeyboardMouse",
"groups": "",
"action": "Cancel",
"isComposite": false,
"isPartOfComposite": false
......@@ -1124,6 +1114,72 @@
"action": "Redo",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ef3bf6b0-965e-42f3-bddf-232a58b4a8fa",
"path": "<Keyboard>/w",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move_Forward",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f0e2a0cc-498f-4c61-b0d3-1857adc31bc4",
"path": "<Gamepad>/leftStick/up",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move_Forward",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ec183df0-8773-49fe-a019-cb365fa46443",
"path": "<Keyboard>/a",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move_Left",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3b5a10f6-2534-488b-b43b-36799f6f7cf4",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move_Backwards",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b33bf585-71de-44bc-b8a2-7aaa822d5276",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move_Right",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6146bad3-ae9d-413d-b780-4354d75b63ed",
"path": "",
"interactions": "",
"processors": "",
"groups": "",
"action": "New action",
"isComposite": false,
"isPartOfComposite": false
}
]
},
......
Assets/Scripts/UI/UIconfig.cs
+ 1
− 1
View file @ 2d4694cb
......@@ -44,7 +44,7 @@ public static class UIconfig
public static int touchControlMode = 1;
public static int touchControlMode = 1; //1=buttons, 2, 3
public static float TAvisibility = 1;
public static bool MouseKeepingInWindow=true;
......
Assets/StreamingAssets/Config/Network.JSON
+ 1
− 1
View file @ 2d4694cb
......@@ -14,7 +14,7 @@
"InputManagerVersion":"1",
"colliderScale_all":"1.2",
"cursorSize":"0.03125",
"camRotatingSensitivity":"2f"
"camRotatingSensitivity":"2f",
"MouseKeepingInWindow":"true"
}
Packages/manifest.json
+ 9
− 0
View file @ 2d4694cb
......@@ -10,10 +10,19 @@
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.3.0",
<<<<<<< HEAD
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.probuilder": "5.0.3",
"com.unity.purchasing": "4.1.5",
"com.unity.test-framework": "1.1.31",
=======
"com.unity.jobs": "0.51.0-preview.32",
"com.unity.multiplayer-hlapi": "1.0.8",
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.probuilder": "4.2.1",
"com.unity.purchasing": "3.2.2",
"com.unity.test-framework": "1.1.29",
>>>>>>> zwischenSpeichern
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.4",
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment