iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
mappy 2023-09-20 13:17:44 +09:00
commit 462271d683
3 changed files with 838 additions and 807 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1550
BlueWater/Assets/01.Scenes/02.Main.unity
View File

File diff suppressed because it is too large Load Diff

56
BlueWater/Assets/02.Scripts/BlueWater.cs
View File

@ -127,7 +127,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/w"", ""path"": ""<Keyboard>/w"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""Move"", ""action"": ""Move"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": true ""isPartOfComposite"": true
@ -138,7 +138,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/s"", ""path"": ""<Keyboard>/s"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""Move"", ""action"": ""Move"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": true ""isPartOfComposite"": true
@ -149,7 +149,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/a"", ""path"": ""<Keyboard>/a"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""Move"", ""action"": ""Move"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": true ""isPartOfComposite"": true
@ -160,7 +160,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/d"", ""path"": ""<Keyboard>/d"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""Move"", ""action"": ""Move"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": true ""isPartOfComposite"": true
@ -171,7 +171,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/v"", ""path"": ""<Keyboard>/v"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""AssaultMode"", ""action"": ""AssaultMode"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
@ -182,7 +182,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/f"", ""path"": ""<Keyboard>/f"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""Interaction"", ""action"": ""Interaction"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
@ -193,7 +193,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/f"", ""path"": ""<Keyboard>/f"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""InteractionHold"", ""action"": ""InteractionHold"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
@ -204,7 +204,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/z"", ""path"": ""<Keyboard>/z"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""Zkey"", ""action"": ""Zkey"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
@ -215,7 +215,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/space"", ""path"": ""<Keyboard>/space"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""TakeAim"", ""action"": ""TakeAim"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
@ -226,7 +226,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/e"", ""path"": ""<Keyboard>/e"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""InteractionE"", ""action"": ""InteractionE"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
@ -237,7 +237,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/q"", ""path"": ""<Keyboard>/q"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""Targeting"", ""action"": ""Targeting"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
@ -248,7 +248,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""path"": ""<Keyboard>/q"", ""path"": ""<Keyboard>/q"",
""interactions"": """", ""interactions"": """",
""processors"": """", ""processors"": """",
""groups"": ""Keyboard"", ""groups"": ""Keyboard&Mouse"",
""action"": ""TargetingHold"", ""action"": ""TargetingHold"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
@ -365,8 +365,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
], ],
""controlSchemes"": [ ""controlSchemes"": [
{ {
""name"": ""Keyboard"", ""name"": ""Keyboard&Mouse"",
""bindingGroup"": ""Keyboard"", ""bindingGroup"": ""Keyboard&Mouse"",
""devices"": [ ""devices"": [
{ {
""devicePath"": ""<Keyboard>"", ""devicePath"": ""<Keyboard>"",
@ -379,6 +379,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""isOR"": false ""isOR"": false
} }
] ]
},
{
""name"": ""Gamepad"",
""bindingGroup"": ""Gamepad"",
""devices"": [
{
""devicePath"": ""<Gamepad>"",
""isOptional"": false,
""isOR"": false
}
]
} }
] ]
}"); }");
@ -676,13 +687,22 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
} }
} }
public UnitActions @Unit => new UnitActions(this); public UnitActions @Unit => new UnitActions(this);
private int m_KeyboardSchemeIndex = -1; private int m_KeyboardMouseSchemeIndex = -1;
public InputControlScheme KeyboardScheme public InputControlScheme KeyboardMouseScheme
{ {
get get
{ {
if (m_KeyboardSchemeIndex == -1) m_KeyboardSchemeIndex = asset.FindControlSchemeIndex("Keyboard"); if (m_KeyboardMouseSchemeIndex == -1) m_KeyboardMouseSchemeIndex = asset.FindControlSchemeIndex("Keyboard&Mouse");
return asset.controlSchemes[m_KeyboardSchemeIndex]; return asset.controlSchemes[m_KeyboardMouseSchemeIndex];
}
}
private int m_GamepadSchemeIndex = -1;
public InputControlScheme GamepadScheme
{
get
{
if (m_GamepadSchemeIndex == -1) m_GamepadSchemeIndex = asset.FindControlSchemeIndex("Gamepad");
return asset.controlSchemes[m_GamepadSchemeIndex];
} }
} }
public interface IPlayerActions public interface IPlayerActions

39
BlueWater/Assets/02.Scripts/BlueWater.inputactions
View File

@ -105,7 +105,7 @@
"path": "<Keyboard>/w", "path": "<Keyboard>/w",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "Move", "action": "Move",
"isComposite": false, "isComposite": false,
"isPartOfComposite": true "isPartOfComposite": true
@ -116,7 +116,7 @@
"path": "<Keyboard>/s", "path": "<Keyboard>/s",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "Move", "action": "Move",
"isComposite": false, "isComposite": false,
"isPartOfComposite": true "isPartOfComposite": true
@ -127,7 +127,7 @@
"path": "<Keyboard>/a", "path": "<Keyboard>/a",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "Move", "action": "Move",
"isComposite": false, "isComposite": false,
"isPartOfComposite": true "isPartOfComposite": true
@ -138,7 +138,7 @@
"path": "<Keyboard>/d", "path": "<Keyboard>/d",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "Move", "action": "Move",
"isComposite": false, "isComposite": false,
"isPartOfComposite": true "isPartOfComposite": true
@ -149,7 +149,7 @@
"path": "<Keyboard>/v", "path": "<Keyboard>/v",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "AssaultMode", "action": "AssaultMode",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
@ -160,7 +160,7 @@
"path": "<Keyboard>/f", "path": "<Keyboard>/f",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "Interaction", "action": "Interaction",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
@ -171,7 +171,7 @@
"path": "<Keyboard>/f", "path": "<Keyboard>/f",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "InteractionHold", "action": "InteractionHold",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
@ -182,7 +182,7 @@
"path": "<Keyboard>/z", "path": "<Keyboard>/z",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "Zkey", "action": "Zkey",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
@ -193,7 +193,7 @@
"path": "<Keyboard>/space", "path": "<Keyboard>/space",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "TakeAim", "action": "TakeAim",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
@ -204,7 +204,7 @@
"path": "<Keyboard>/e", "path": "<Keyboard>/e",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "InteractionE", "action": "InteractionE",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
@ -215,7 +215,7 @@
"path": "<Keyboard>/q", "path": "<Keyboard>/q",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "Targeting", "action": "Targeting",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
@ -226,7 +226,7 @@
"path": "<Keyboard>/q", "path": "<Keyboard>/q",
"interactions": "", "interactions": "",
"processors": "", "processors": "",
"groups": "Keyboard", "groups": "Keyboard&Mouse",
"action": "TargetingHold", "action": "TargetingHold",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
@ -343,8 +343,8 @@
], ],
"controlSchemes": [ "controlSchemes": [
{ {
"name": "Keyboard", "name": "Keyboard&Mouse",
"bindingGroup": "Keyboard", "bindingGroup": "Keyboard&Mouse",
"devices": [ "devices": [
{ {
"devicePath": "<Keyboard>", "devicePath": "<Keyboard>",
@ -357,6 +357,17 @@
"isOR": false "isOR": false
} }
] ]
},
{
"name": "Gamepad",
"bindingGroup": "Gamepad",
"devices": [
{
"devicePath": "<Gamepad>",
"isOptional": false,
"isOR": false
}
]
} }
] ]
} }