Skip to content

Commit 49d6fce

Browse files
jsm174freezy
authored andcommitted
misc: bump to netstandard2.0.
1 parent 88943b3 commit 49d6fce

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

VisualPinball.Engine.Mpf.Unity/Runtime/MpfGamelogicEngine.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ public class MpfGamelogicEngine : MonoBehaviour, IGamelogicEngine
3131

3232
public GamelogicEngineSwitch[] AvailableSwitches => availableSwitches;
3333
public GamelogicEngineCoil[] AvailableCoils => availableCoils;
34-
public GamelogicEngineLamp[] AvailableLamps => availableLamps;
35-
34+
public GamelogicEngineLamp[] AvailableLamps => availableLamps;
35+
public GamelogicEngineWire[] AvailableWires => availableWires;
36+
3637
public event EventHandler<LampEventArgs> OnLampChanged;
3738
public event EventHandler<LampsEventArgs> OnLampsChanged;
3839
public event EventHandler<LampColorEventArgs> OnLampColorChanged;
@@ -48,6 +49,7 @@ public class MpfGamelogicEngine : MonoBehaviour, IGamelogicEngine
4849
[SerializeField] private GamelogicEngineSwitch[] availableSwitches = new GamelogicEngineSwitch[0];
4950
[SerializeField] private GamelogicEngineCoil[] availableCoils = new GamelogicEngineCoil[0];
5051
[SerializeField] private GamelogicEngineLamp[] availableLamps = new GamelogicEngineLamp[0];
52+
[SerializeField] private GamelogicEngineWire[] availableWires = new GamelogicEngineWire[0];
5153

5254
private Player _player;
5355
private Dictionary<string, int> _switchIds = new Dictionary<string, int>();
@@ -94,13 +96,13 @@ public void OnInit(Player player, TableApi tableApi, BallManager ballManager)
9496

9597
// map initial switches
9698
var mappedSwitchStatuses = new Dictionary<string, bool>();
97-
foreach (var swName in player.SwitchStatusesClosed.Keys) {
99+
/*FIX: foreach (var swName in player.SwitchStatusesClosed.Keys) {
98100
if (_switchIds.ContainsKey(swName)) {
99101
mappedSwitchStatuses[_switchIds[swName].ToString()] = player.SwitchStatusesClosed[swName];
100102
} else {
101103
Logger.Warn($"Unknown intial switch name \"{swName}\".");
102104
}
103-
}
105+
}*/
104106
_api.StartGame(mappedSwitchStatuses);
105107
Logger.Info("Game started.");
106108
}
@@ -205,7 +207,7 @@ private void OnConfigureHardwareRule(object sender, ConfigureHardwareRuleRequest
205207
return;
206208
}
207209

208-
_player.Queue(() => _player.AddDynamicWire(_switchNames[e.SwitchNumber], _coilNames[e.CoilNumber]));
210+
/*FIX: _player.Queue(() => _player.AddDynamicWire(_switchNames[e.SwitchNumber], _coilNames[e.CoilNumber]));*/
209211
Logger.Info($"<-- new hardware rule: {_switchNames[e.SwitchNumber]} -> {_coilNames[e.CoilNumber]}.");
210212
}
211213

@@ -220,7 +222,7 @@ private void OnRemoveHardwareRule(object sender, RemoveHardwareRuleRequest e)
220222
return;
221223
}
222224

223-
_player.Queue(() => _player.RemoveDynamicWire(_switchNames[e.SwitchNumber], _coilNames[e.CoilNumber]));
225+
/*FIX: _player.Queue(() => _player.RemoveDynamicWire(_switchNames[e.SwitchNumber], _coilNames[e.CoilNumber]));*/
224226
Logger.Info($"<-- remove hardware rule: {_switchNames[e.SwitchNumber]} -> {_coilNames[e.CoilNumber]}.");
225227
}
226228

VisualPinball.Engine.Mpf.Unity/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"Unity",
88
"Mission Pinball Framework"
99
],
10-
"unity": "2020.3",
11-
"unityRelease": "0f1",
10+
"unity": "2021.2",
11+
"unityRelease": "4f1",
1212
"dependencies": {},
1313
"author": "freezy <[email protected]>",
1414
"contributors": [

VisualPinball.Engine.Mpf/VisualPinball.Engine.Mpf.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net4.7.2</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<LangVersion>9.0</LangVersion>
66
<AssemblyVersion>0.1.0.0</AssemblyVersion>
77
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -23,9 +23,6 @@
2323
<PackageReference Include="Grpc" Version="2.42.0" />
2424
<PackageReference Include="Google.Protobuf" Version="3.19.1" />
2525
<PackageReference Include="NLog" Version="4.7.12" />
26-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
27-
<PrivateAssets>all</PrivateAssets>
28-
</PackageReference>
2926
</ItemGroup>
3027

3128
<ItemGroup>

0 commit comments

Comments
 (0)