unity-tech-cn
/
BoatAttack
39
13
派生 49
代码 合并请求 版本发布
浏览代码

Merge branch 'demo-work' into dots-physics 

# Conflicts:
#	Packages/manifest.json
/dots-input
mikegeig 5 年前
当前提交
3779b047
共有 2 个文件被更改，包括 68 次插入 和 96 次删除
  1. 133
      Assets/Scripts/GameSystem/InputControls.cs
  2. 31
      Packages/manifest.json

133
Assets/Scripts/GameSystem/InputControls.cs
查看文件


// GENERATED AUTOMATICALLY FROM 'Assets/Data/New Controls.inputactions'
using System;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Utilities;

""actions"": [
{
""name"": ""Trottle"",
""type"": ""Value"",
""expectedControlLayout"": ""Axis"",
""continuous"": true,
""passThrough"": false,
""initialStateCheck"": false,
""expectedControlType"": ""Axis"",
""interactions"": """",
""bindings"": []
""interactions"": """"
""type"": ""Value"",
""expectedControlLayout"": ""Axis"",
""continuous"": true,
""passThrough"": false,
""initialStateCheck"": false,
""expectedControlType"": ""Axis"",
""interactions"": """",
""bindings"": []
""interactions"": """"
}
],
""bindings"": [

""groups"": """",
""action"": ""Trottle"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": ""Gamepad"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": ""Gamepad"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""Buttons"",

""groups"": """",
""action"": ""Trottle"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": "";Gamepad"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": "";Gamepad"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""Arrows"",

""groups"": """",
""action"": ""Trottle"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": ""Keyboard"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": ""Keyboard"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""WSAD"",

""groups"": """",
""action"": ""Trottle"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": ""Keyboard"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": ""Keyboard"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""Alt"",

""groups"": """",
""action"": ""Trottle"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": ""Keyboard"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": ""Keyboard"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": """",

""groups"": ""TouchScreen"",
""action"": ""Trottle"",
""isComposite"": false,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""LeftThumbstick"",

""groups"": """",
""action"": ""Steering"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": ""Gamepad"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": ""Gamepad"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""DPad"",

""groups"": """",
""action"": ""Steering"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": "";Gamepad"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": "";Gamepad"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""Arrows"",

""groups"": """",
""action"": ""Steering"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": ""Keyboard"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": ""Keyboard"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""WSAD"",

""groups"": """",
""action"": ""Steering"",
""isComposite"": true,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
},
{
""name"": ""negative"",

""groups"": ""Keyboard"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": ""positive"",

""groups"": ""Keyboard"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": true,
""modifiers"": """"
""isPartOfComposite"": true
},
{
""name"": """",

""groups"": ""TouchScreen"",
""action"": ""Steering"",
""isComposite"": false,
""isPartOfComposite"": false,
""modifiers"": """"
""isPartOfComposite"": false
}
]
}

set => asset.devices = value;
}
public ReadOnlyArray<InputControlScheme> controlSchemes
{
get => asset.controlSchemes;
}
public ReadOnlyArray<InputControlScheme> controlSchemes => asset.controlSchemes;
public bool Contains(InputAction action)
{

}
// BoatControls
private InputActionMap m_BoatControls;
private readonly InputActionMap m_BoatControls;
private InputAction m_BoatControls_Trottle;
private InputAction m_BoatControls_Steering;
private readonly InputAction m_BoatControls_Trottle;
private readonly InputAction m_BoatControls_Steering;
public InputAction @Trottle { get { return m_Wrapper.m_BoatControls_Trottle; } }
public InputAction @Steering { get { return m_Wrapper.m_BoatControls_Steering; } }
public InputAction @Trottle => m_Wrapper.m_BoatControls_Trottle;
public InputAction @Steering => m_Wrapper.m_BoatControls_Steering;
public bool enabled { get { return Get().enabled; } }
public InputActionMap Clone() { return Get().Clone(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(BoatControlsActions set) { return set.Get(); }
public void SetCallbacks(IBoatControlsActions instance)
{

}
}
}
public BoatControlsActions @BoatControls
{
get
{
return new BoatControlsActions(this);
}
}
public BoatControlsActions @BoatControls => new BoatControlsActions(this);
private int m_GamepadSchemeIndex = -1;
public InputControlScheme GamepadScheme
{

31
Packages/manifest.json
查看文件


{
"registry": "https://staging-packages.unity.com",
"com.unity.burst": "1.1.1",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "2.0.8",
"com.unity.analytics": "3.3.2",
"com.unity.burst": "1.1.2",
"com.unity.ide.rider": "1.0.8",
"com.unity.inputsystem": "0.3.0-preview",
"com.unity.physics": "0.1.0-preview",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.0",
"com.unity.ide.vscode": "1.0.7",
"com.unity.inputsystem": "0.9.2-preview",
"com.unity.physics": "0.1.0-preview",
"com.unity.render-pipelines.lightweight": "7.0.0",
"com.unity.multiplayer-hlapi": "1.0.4",
"com.unity.purchasing": "2.0.6",
"com.unity.render-pipelines.universal": "7.0.1",
"com.unity.test-framework": "1.0.17",
"com.unity.xr.legacyinputhelpers": "2.0.6",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.cloth": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",

"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
撰写 预览
正在加载...
取消
保存