浏览代码

Merge branch 'pr-bash' into main

# Conflicts:
#	UOP1_Project/Assets/Scripts/Input/GameInput.cs
#	UOP1_Project/Assets/Settings/Input/GameInput.inputactions
/main
Ciro Continisio 4 年前
当前提交
eec53055
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 6
      UOP1_Project/Assets/Scripts/Input/GameInput.cs
  2. 6
      UOP1_Project/Assets/Settings/Input/GameInput.inputactions

6
UOP1_Project/Assets/Scripts/Input/GameInput.cs


""id"": ""2b832572-50ef-4dba-aaeb-964ed1c854bb"",
""path"": ""<Gamepad>/rightStick"",
""interactions"": """",
""processors"": ""StickDeadzone,ScaleVector2(x=10,y=10)"",
""processors"": ""StickDeadzone,ScaleVector2(x=8,y=8)"",
""groups"": ""KeyboardOrGamepad"",
""action"": ""RotateCamera"",
""isComposite"": false,

""id"": ""8e17360e-f036-4963-93f6-05d14787dfb5"",
""path"": ""2DVector(mode=1)"",
""interactions"": """",
""processors"": ""ScaleVector2(x=10,y=10)"",
""processors"": ""ScaleVector2(x=8,y=8)"",
""groups"": """",
""action"": ""RotateCamera"",
""isComposite"": true,

""id"": ""88e5a69d-cf1d-43ce-b5ab-9db67f819255"",
""path"": ""<Mouse>/delta"",
""interactions"": """",
""processors"": """",
""processors"": ""ScaleVector2(x=2,y=2)"",
""groups"": ""KeyboardOrGamepad"",
""action"": ""RotateCamera"",
""isComposite"": false,

6
UOP1_Project/Assets/Settings/Input/GameInput.inputactions


"id": "2b832572-50ef-4dba-aaeb-964ed1c854bb",
"path": "<Gamepad>/rightStick",
"interactions": "",
"processors": "StickDeadzone,ScaleVector2(x=10,y=10)",
"processors": "StickDeadzone,ScaleVector2(x=8,y=8)",
"groups": "KeyboardOrGamepad",
"action": "RotateCamera",
"isComposite": false,

"id": "8e17360e-f036-4963-93f6-05d14787dfb5",
"path": "2DVector(mode=1)",
"interactions": "",
"processors": "ScaleVector2(x=10,y=10)",
"processors": "ScaleVector2(x=8,y=8)",
"groups": "",
"action": "RotateCamera",
"isComposite": true,

"id": "88e5a69d-cf1d-43ce-b5ab-9db67f819255",
"path": "<Mouse>/delta",
"interactions": "",
"processors": "",
"processors": "ScaleVector2(x=2,y=2)",
"groups": "KeyboardOrGamepad",
"action": "RotateCamera",
"isComposite": false,

正在加载...
取消
保存