Skip to content

Commit c03a86e

Browse files
committed
Add input support for new beam modifier feature on LF.
1 parent 56f2d48 commit c03a86e

File tree

4 files changed

+65
-10
lines changed

4 files changed

+65
-10
lines changed

Assets/InputSystem_Actions.inputactions

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,15 @@
931931
"processors": "",
932932
"interactions": "",
933933
"initialStateCheck": false
934+
},
935+
{
936+
"name": "CycleBeamModifier",
937+
"type": "Button",
938+
"id": "76acec58-a57c-4643-b5e5-6ec972e68054",
939+
"expectedControlType": "",
940+
"processors": "",
941+
"interactions": "",
942+
"initialStateCheck": false
934943
}
935944
],
936945
"bindings": [
@@ -1241,6 +1250,17 @@
12411250
"action": "Jump",
12421251
"isComposite": false,
12431252
"isPartOfComposite": false
1253+
},
1254+
{
1255+
"name": "",
1256+
"id": "2063c32c-b59a-4550-968f-9177b46f63ae",
1257+
"path": "<Keyboard>/f",
1258+
"interactions": "",
1259+
"processors": "",
1260+
"groups": ";Keyboard&Mouse",
1261+
"action": "CycleBeamModifier",
1262+
"isComposite": false,
1263+
"isPartOfComposite": false
12441264
}
12451265
]
12461266
}

Assets/Prefabs/LightFamiliar.prefab

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ MonoBehaviour:
142142
m_Script: {fileID: 11500000, guid: e2d528655db02ce4aa3ed5957063cb9e, type: 3}
143143
m_Name:
144144
m_EditorClassIdentifier:
145-
_beamChanger: {fileID: 0}
145+
_beamChanger: {fileID: 2747804367269425522}
146146
_playerControllerReference: {fileID: 0}
147147
_rigidbody: {fileID: 7358544652446688784}
148148
_movementSpeed: 5
@@ -247,6 +247,8 @@ GameObject:
247247
- component: {fileID: 2262687684910580198}
248248
- component: {fileID: 2747804367269425522}
249249
- component: {fileID: 4627988395739533382}
250+
- component: {fileID: 2720897914464504946}
251+
- component: {fileID: 6925152222535806534}
250252
m_Layer: 0
251253
m_Name: LFLightBeamController
252254
m_TagString: Untagged
@@ -406,5 +408,33 @@ MonoBehaviour:
406408
m_Script: {fileID: 11500000, guid: 9586ab9f8ddd2f54295d1284e305dfd7, type: 3}
407409
m_Name:
408410
m_EditorClassIdentifier:
409-
_colour: {r: 0, g: 0, b: 0, a: 0}
410-
_beamForce: 0
411+
_colour: {r: 1, g: 1, b: 1, a: 1}
412+
_beamForce: 10
413+
--- !u!114 &2720897914464504946
414+
MonoBehaviour:
415+
m_ObjectHideFlags: 0
416+
m_CorrespondingSourceObject: {fileID: 0}
417+
m_PrefabInstance: {fileID: 0}
418+
m_PrefabAsset: {fileID: 0}
419+
m_GameObject: {fileID: 6458314666040974726}
420+
m_Enabled: 1
421+
m_EditorHideFlags: 0
422+
m_Script: {fileID: 11500000, guid: c9b2fda522cc0cf4cbb0583fe35dc756, type: 3}
423+
m_Name:
424+
m_EditorClassIdentifier:
425+
_colour: {r: 1, g: 0.59788513, b: 0, a: 1}
426+
_beamForce: 10
427+
--- !u!114 &6925152222535806534
428+
MonoBehaviour:
429+
m_ObjectHideFlags: 0
430+
m_CorrespondingSourceObject: {fileID: 0}
431+
m_PrefabInstance: {fileID: 0}
432+
m_PrefabAsset: {fileID: 0}
433+
m_GameObject: {fileID: 6458314666040974726}
434+
m_Enabled: 1
435+
m_EditorHideFlags: 0
436+
m_Script: {fileID: 11500000, guid: eec5bf09ed2c76d469d418b92295893a, type: 3}
437+
m_Name:
438+
m_EditorClassIdentifier:
439+
_colour: {r: 0.07406576, g: 0.7264151, b: 0, a: 1}
440+
_beamForce: 10

Assets/Scenes/MattsTestingLab.unity

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6223,15 +6223,15 @@ PrefabInstance:
62236223
m_Modifications:
62246224
- target: {fileID: 1440071002541915721, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62256225
propertyPath: m_Layer
6226-
value: 6
6226+
value: 0
62276227
objectReference: {fileID: 0}
62286228
- target: {fileID: 3164417712867505803, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62296229
propertyPath: m_LocalPosition.x
6230-
value: 5.09
6230+
value: -13.07
62316231
objectReference: {fileID: 0}
62326232
- target: {fileID: 3164417712867505803, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62336233
propertyPath: m_LocalPosition.y
6234-
value: 11.13
6234+
value: 0.66
62356235
objectReference: {fileID: 0}
62366236
- target: {fileID: 3164417712867505803, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62376237
propertyPath: m_LocalPosition.z
@@ -6271,15 +6271,15 @@ PrefabInstance:
62716271
objectReference: {fileID: 0}
62726272
- target: {fileID: 3923391215170929848, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62736273
propertyPath: m_Layer
6274-
value: 6
6274+
value: 0
62756275
objectReference: {fileID: 0}
62766276
- target: {fileID: 4770078755903285949, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62776277
propertyPath: m_SortingOrder
62786278
value: 0
62796279
objectReference: {fileID: 0}
62806280
- target: {fileID: 5688382727879582895, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62816281
propertyPath: m_Layer
6282-
value: 6
6282+
value: 0
62836283
objectReference: {fileID: 0}
62846284
- target: {fileID: 6568422993832989609, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62856285
propertyPath: m_LocalScale.z
@@ -6291,11 +6291,11 @@ PrefabInstance:
62916291
objectReference: {fileID: 0}
62926292
- target: {fileID: 7443907167455557030, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62936293
propertyPath: m_Layer
6294-
value: 6
6294+
value: 0
62956295
objectReference: {fileID: 0}
62966296
- target: {fileID: 7850566374596847418, guid: 96a693b72cc46a146a61a47e2fd66554, type: 3}
62976297
propertyPath: m_Layer
6298-
value: 6
6298+
value: 0
62996299
objectReference: {fileID: 0}
63006300
m_RemovedComponents: []
63016301
m_RemovedGameObjects: []

Assets/Scripts/Controllers/FamiliarController.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ private void SwapCharacters()
114114
}
115115
}
116116

117+
protected void OnCycleBeamModifier()
118+
{
119+
CycleModifiers();
120+
}
121+
117122
private void CycleModifiers()
118123
{
119124
var modifiers = GetComponentsInChildren<LightBeamModifier>();

0 commit comments

Comments
 (0)