Skip to content

Commit 96bf842

Browse files
stop-patternstop-pattern
authored
Merge pull request #2 from stop-pattern/develop
Develop
2 parents 27d8349 + 2d84e5d commit 96bf842

20 files changed

+192
-677
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
uses: actions/[email protected]
2525

2626
- name: Restore nuget packages
27-
run: dotnet restore AtsExCsTemplate.sln --locked-mode
27+
run: dotnet restore CommEx.sln --locked-mode
2828

2929
- name: MSBuild
30-
run: dotnet publish .\AtsExCsTemplate.sln --configuration Release --no-restore /p:platform="Any CPU" /p:OutputPath="./out/"
30+
run: dotnet publish .\CommEx.sln --configuration Release --no-restore /p:platform="Any CPU" /p:OutputPath="./out/"
3131

3232
- name: Collect artifact
3333
run: |

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
- name: Setup .NET
2121
uses: actions/[email protected]
2222
- name: Restore nuget packages
23-
run: dotnet restore AtsExCsTemplate.sln --locked-mode
23+
run: dotnet restore CommEx.sln --locked-mode
2424
- name: Build sln
25-
run: dotnet publish .\AtsExCsTemplate.sln --configuration Release --no-restore /p:platform="Any CPU" /p:OutputPath="./out/"
25+
run: dotnet publish .\CommEx.sln --configuration Release --no-restore /p:platform="Any CPU" /p:OutputPath="./out/"
2626
- name: Collect artifact
2727
run: |
2828
mkdir plugins/

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ FodyWeavers.xsd
383383
!.vscode/launch.json
384384
!.vscode/extensions.json
385385
*.code-workspace
386+
/CommEx/Properties/launchSettings.json
386387

387388
# Local History for Visual Studio Code
388389
.history/

‎AtsExCsTemplate.sln

-37
This file was deleted.

‎CommEx.sln

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.5.33516.290
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommEx", "CommEx\CommEx.csproj", "{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {7A01144D-3066-4B8F-9C06-A9212986B216}
24+
EndGlobalSection
25+
EndGlobal

‎MapPlugin/MapPlugin.csproj renamed to ‎CommEx/CommEx.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33

44
<PropertyGroup>
55
<TargetFramework>net48</TargetFramework>
6-
<RootNamespace>AtsExCsTemplate.MapPlugin</RootNamespace>
6+
<RootNamespace>CommEx</RootNamespace>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<Deterministic>false</Deterministic>
99
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="AtsEx.CoreExtensions" Version="1.0.0-rc7">
13+
<PackageReference Include="AtsEx.CoreExtensions" Version="1.0.0-rc9">
1414
<PrivateAssets>all</PrivateAssets>
1515
</PackageReference>
16-
<PackageReference Include="AtsEx.PluginHost" Version="1.0.0-rc8">
16+
<PackageReference Include="AtsEx.PluginHost" Version="1.0.0-rc9">
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
1919
</ItemGroup>

‎Extension/Properties/AssemblyInfo.cs renamed to ‎CommEx/Properties/AssemblyInfo.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// アセンブリに関する一般情報は以下を通して制御されます
44
// 制御されます。アセンブリに関連付けられている情報を変更するには、
55
// これらの属性値を変更してください。
6-
[assembly: AssemblyTitle("Extension")]
7-
[assembly: AssemblyDescription("")]
6+
[assembly: AssemblyTitle("CommEx")]
7+
[assembly: AssemblyDescription("AtsEXを通してBveと外部で通信する")]
88
[assembly: AssemblyConfiguration("")]
9-
[assembly: AssemblyCompany("")]
10-
[assembly: AssemblyProduct("Extension")]
11-
[assembly: AssemblyCopyright("Copyright © 2023")]
9+
[assembly: AssemblyCompany("stop-pattern")]
10+
[assembly: AssemblyProduct("CommEx")]
11+
[assembly: AssemblyCopyright("Copyright © 2024 stop-pattern")]
1212
[assembly: AssemblyTrademark("")]
1313
[assembly: AssemblyCulture("")]
1414

@@ -23,4 +23,4 @@
2323
// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
2424
// 既定値にすることができます:
2525
// [assembly: AssemblyVersion("1.0.*")]
26-
[assembly: AssemblyVersion("1.11.*")]
26+
[assembly: AssemblyVersion("0.01.*")]

‎CommEx/Serial/Main.cs

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
using AtsEx.PluginHost.Plugins;
8+
using AtsEx.PluginHost.Plugins.Extensions;
9+
10+
namespace CommEx.Serial
11+
{
12+
/// <summary>
13+
/// プラグインの本体
14+
/// Plugin() の第一引数でこのプラグインの仕様を指定
15+
/// Plugin() の第二引数でこのプラグインが必要とするAtsEX本体の最低バージョンを指定（オプション）
16+
/// </summary>
17+
[Plugin(PluginType.Extension)]
18+
[Togglable]
19+
internal class Serial : AssemblyPluginBase, ITogglableExtension, IExtension
20+
{
21+
/// <inheritdoc/>
22+
public override string Title { get; } = nameof(Serial);
23+
/// <inheritdoc/>
24+
public override string Description { get; } = "シリアル通信";
25+
26+
/// <summary>
27+
/// プラグインの有効・無効状態
28+
/// </summary>
29+
private bool status = true;
30+
31+
/// <inheritdoc/>
32+
public bool IsEnabled
33+
{
34+
get { return status; }
35+
set { status = value; }
36+
}
37+
38+
/// <summary>
39+
/// プラグインが読み込まれた時に呼ばれる
40+
/// 初期化を実装する
41+
/// </summary>
42+
/// <param name="builder"></param>
43+
public Serial(PluginBuilder builder) : base(builder)
44+
{
45+
Extensions.AllExtensionsLoaded += Extensions_AllExtensionsLoaded;
46+
}
47+
48+
/// <summary>
49+
/// 全ての AtsEX 拡張機能が読み込まれ、AtsEx.PluginHost.Plugins.Extensions プロパティが取得可能になると発生
50+
/// </summary>
51+
/// <param name="sender"></param>
52+
/// <param name="e"></param>
53+
private void Extensions_AllExtensionsLoaded(object sender, EventArgs e)
54+
{
55+
}
56+
57+
/// <summary>
58+
/// プラグインが解放されたときに呼ばれる
59+
/// 後処理を実装する
60+
/// </summary>
61+
public override void Dispose()
62+
{
63+
Extensions.AllExtensionsLoaded -= Extensions_AllExtensionsLoaded;
64+
}
65+
66+
/// <summary>
67+
/// シナリオ読み込み中に毎フレーム呼び出される
68+
/// </summary>
69+
/// <param name="elapsed">前回フレームからの経過時間</param>
70+
public override TickResult Tick(TimeSpan elapsed)
71+
{
72+
return new ExtensionTickResult();
73+
}
74+
}
75+
}

‎Extension/Extension.cs renamed to ‎CommEx/Udp/Main.cs

+21-3
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,40 @@
77
using AtsEx.PluginHost.Plugins;
88
using AtsEx.PluginHost.Plugins.Extensions;
99

10-
namespace AtsExCsTemplate.Extension
10+
namespace CommEx.Udp
1111
{
1212
/// <summary>
1313
/// プラグインの本体
1414
/// Plugin() の第一引数でこのプラグインの仕様を指定
1515
/// Plugin() の第二引数でこのプラグインが必要とするAtsEX本体の最低バージョンを指定（オプション）
1616
/// </summary>
1717
[Plugin(PluginType.Extension)]
18-
internal class ExtensionMain : AssemblyPluginBase, IExtension
18+
[Togglable]
19+
internal class Udp : AssemblyPluginBase, ITogglableExtension, IExtension
1920
{
21+
/// <inheritdoc/>
22+
public override string Title { get; } = nameof(Udp);
23+
/// <inheritdoc/>
24+
public override string Description { get; } = "UDP";
25+
26+
/// <summary>
27+
/// プラグインの有効・無効状態
28+
/// </summary>
29+
private bool status = false;
30+
31+
/// <inheritdoc/>
32+
public bool IsEnabled
33+
{
34+
get { return status; }
35+
set { status = value; }
36+
}
37+
2038
/// <summary>
2139
/// プラグインが読み込まれた時に呼ばれる
2240
/// 初期化を実装する
2341
/// </summary>
2442
/// <param name="builder"></param>
25-
public ExtensionMain(PluginBuilder builder) : base(builder)
43+
public Udp(PluginBuilder builder) : base(builder)
2644
{
2745
}
2846

‎Extension/packages.lock.json renamed to ‎CommEx/packages.lock.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
".NETFramework,Version=v4.8": {
55
"AtsEx.CoreExtensions": {
66
"type": "Direct",
7-
"requested": "[1.0.0-rc7, )",
8-
"resolved": "1.0.0-rc7",
9-
"contentHash": "wpQIS8smxANiPt4gBD0LpWa3408wfLVY1gRvJvWeV4OFuIJHXMaTwEZgtpa+UsTmKxfX4S4KbdCCg1xBCDmaWg==",
7+
"requested": "[1.0.0-rc9, )",
8+
"resolved": "1.0.0-rc9",
9+
"contentHash": "b9KGmP9t37+L+9xt2NnI7a/mCh6i8A2Vodx6w/CkwT08bPqe9IsfCt/nSIT0Q8DghTU2nykSN/BBP1TCSH/0ng==",
1010
"dependencies": {
1111
"AtsEx.PluginHost": "1.0.0-rc1",
1212
"ObjectiveHarmonyPatch": "1.1.0"
1313
}
1414
},
1515
"AtsEx.PluginHost": {
1616
"type": "Direct",
17-
"requested": "[1.0.0-rc8, )",
18-
"resolved": "1.0.0-rc8",
19-
"contentHash": "W/1suCpKZ0y7E6dl2Y1iY10kJ5D9KD1m3XUWiz3Z1H5NHFcJU32Hz2ON+So9iDUCSIVG0C06RfbsHCpY9x4dvw==",
17+
"requested": "[1.0.0-rc9, )",
18+
"resolved": "1.0.0-rc9",
19+
"contentHash": "UjhPUohYL8hiMCwvJGQ0IZ5ALcgesonhTGMPO9f2ZjbOMLyHtIdPZj3yeqWUxfX4RqkgKwRidvw9G9OQo61BQA==",
2020
"dependencies": {
2121
"SlimDX": "4.0.13.44",
2222
"UnembeddedResources": "1.0.0"

‎Extension/Extension.csproj

-21
This file was deleted.

‎MapPlugin/MapPlugin.cs

-45
This file was deleted.

‎MapPlugin/Properties/AssemblyInfo.cs

-25
This file was deleted.

0 commit comments

Comments
 (0)