Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #2

Merged
merged 9 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
uses: actions/setup-dotnet@v4.0.0

- name: Restore nuget packages
run: dotnet restore AtsExCsTemplate.sln --locked-mode
run: dotnet restore CommEx.sln --locked-mode

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

- name: Collect artifact
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4.0.0
- name: Restore nuget packages
run: dotnet restore AtsExCsTemplate.sln --locked-mode
run: dotnet restore CommEx.sln --locked-mode
- name: Build sln
run: dotnet publish .\AtsExCsTemplate.sln --configuration Release --no-restore /p:platform="Any CPU" /p:OutputPath="./out/"
run: dotnet publish .\CommEx.sln --configuration Release --no-restore /p:platform="Any CPU" /p:OutputPath="./out/"
- name: Collect artifact
run: |
mkdir plugins/
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ FodyWeavers.xsd
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
/CommEx/Properties/launchSettings.json

# Local History for Visual Studio Code
.history/
Expand Down
37 changes: 0 additions & 37 deletions AtsExCsTemplate.sln

This file was deleted.

25 changes: 25 additions & 0 deletions CommEx.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.33516.290
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommEx", "CommEx\CommEx.csproj", "{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE56A6F8-0E94-4E02-9EC9-E4E8CADAC3B0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7A01144D-3066-4B8F-9C06-A9212986B216}
EndGlobalSection
EndGlobal
6 changes: 3 additions & 3 deletions MapPlugin/MapPlugin.csproj → CommEx/CommEx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

<PropertyGroup>
<TargetFramework>net48</TargetFramework>
<RootNamespace>AtsExCsTemplate.MapPlugin</RootNamespace>
<RootNamespace>CommEx</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Deterministic>false</Deterministic>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AtsEx.CoreExtensions" Version="1.0.0-rc7">
<PackageReference Include="AtsEx.CoreExtensions" Version="1.0.0-rc9">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="AtsEx.PluginHost" Version="1.0.0-rc8">
<PackageReference Include="AtsEx.PluginHost" Version="1.0.0-rc9">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
// アセンブリに関する一般情報は以下を通して制御されます
// 制御されます。アセンブリに関連付けられている情報を変更するには、
// これらの属性値を変更してください。
[assembly: AssemblyTitle("Extension")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyTitle("CommEx")]
[assembly: AssemblyDescription("AtsEXを通してBveと外部で通信する")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Extension")]
[assembly: AssemblyCopyright("Copyright © 2023")]
[assembly: AssemblyCompany("stop-pattern")]
[assembly: AssemblyProduct("CommEx")]
[assembly: AssemblyCopyright("Copyright © 2024 stop-pattern")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -23,4 +23,4 @@
// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
// 既定値にすることができます:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.11.*")]
[assembly: AssemblyVersion("0.01.*")]
75 changes: 75 additions & 0 deletions CommEx/Serial/Main.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using AtsEx.PluginHost.Plugins;
using AtsEx.PluginHost.Plugins.Extensions;

namespace CommEx.Serial
{
/// <summary>
/// プラグインの本体
/// Plugin() の第一引数でこのプラグインの仕様を指定
/// Plugin() の第二引数でこのプラグインが必要とするAtsEX本体の最低バージョンを指定(オプション)
/// </summary>
[Plugin(PluginType.Extension)]
[Togglable]
internal class Serial : AssemblyPluginBase, ITogglableExtension, IExtension
{
/// <inheritdoc/>
public override string Title { get; } = nameof(Serial);
/// <inheritdoc/>
public override string Description { get; } = "シリアル通信";

/// <summary>
/// プラグインの有効・無効状態
/// </summary>
private bool status = true;

/// <inheritdoc/>
public bool IsEnabled
{
get { return status; }
set { status = value; }
}

/// <summary>
/// プラグインが読み込まれた時に呼ばれる
/// 初期化を実装する
/// </summary>
/// <param name="builder"></param>
public Serial(PluginBuilder builder) : base(builder)
{
Extensions.AllExtensionsLoaded += Extensions_AllExtensionsLoaded;
}

/// <summary>
/// 全ての AtsEX 拡張機能が読み込まれ、AtsEx.PluginHost.Plugins.Extensions プロパティが取得可能になると発生
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Extensions_AllExtensionsLoaded(object sender, EventArgs e)
{
}

/// <summary>
/// プラグインが解放されたときに呼ばれる
/// 後処理を実装する
/// </summary>
public override void Dispose()
{
Extensions.AllExtensionsLoaded -= Extensions_AllExtensionsLoaded;
}

/// <summary>
/// シナリオ読み込み中に毎フレーム呼び出される
/// </summary>
/// <param name="elapsed">前回フレームからの経過時間</param>
public override TickResult Tick(TimeSpan elapsed)
{
return new ExtensionTickResult();
}
}
}
24 changes: 21 additions & 3 deletions Extension/Extension.cs → CommEx/Udp/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,40 @@
using AtsEx.PluginHost.Plugins;
using AtsEx.PluginHost.Plugins.Extensions;

namespace AtsExCsTemplate.Extension
namespace CommEx.Udp
{
/// <summary>
/// プラグインの本体
/// Plugin() の第一引数でこのプラグインの仕様を指定
/// Plugin() の第二引数でこのプラグインが必要とするAtsEX本体の最低バージョンを指定(オプション)
/// </summary>
[Plugin(PluginType.Extension)]
internal class ExtensionMain : AssemblyPluginBase, IExtension
[Togglable]
internal class Udp : AssemblyPluginBase, ITogglableExtension, IExtension
{
/// <inheritdoc/>
public override string Title { get; } = nameof(Udp);
/// <inheritdoc/>
public override string Description { get; } = "UDP";

/// <summary>
/// プラグインの有効・無効状態
/// </summary>
private bool status = false;

/// <inheritdoc/>
public bool IsEnabled
{
get { return status; }
set { status = value; }
}

/// <summary>
/// プラグインが読み込まれた時に呼ばれる
/// 初期化を実装する
/// </summary>
/// <param name="builder"></param>
public ExtensionMain(PluginBuilder builder) : base(builder)
public Udp(PluginBuilder builder) : base(builder)
{
}

Expand Down
12 changes: 6 additions & 6 deletions Extension/packages.lock.json → CommEx/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
".NETFramework,Version=v4.8": {
"AtsEx.CoreExtensions": {
"type": "Direct",
"requested": "[1.0.0-rc7, )",
"resolved": "1.0.0-rc7",
"contentHash": "wpQIS8smxANiPt4gBD0LpWa3408wfLVY1gRvJvWeV4OFuIJHXMaTwEZgtpa+UsTmKxfX4S4KbdCCg1xBCDmaWg==",
"requested": "[1.0.0-rc9, )",
"resolved": "1.0.0-rc9",
"contentHash": "b9KGmP9t37+L+9xt2NnI7a/mCh6i8A2Vodx6w/CkwT08bPqe9IsfCt/nSIT0Q8DghTU2nykSN/BBP1TCSH/0ng==",
"dependencies": {
"AtsEx.PluginHost": "1.0.0-rc1",
"ObjectiveHarmonyPatch": "1.1.0"
}
},
"AtsEx.PluginHost": {
"type": "Direct",
"requested": "[1.0.0-rc8, )",
"resolved": "1.0.0-rc8",
"contentHash": "W/1suCpKZ0y7E6dl2Y1iY10kJ5D9KD1m3XUWiz3Z1H5NHFcJU32Hz2ON+So9iDUCSIVG0C06RfbsHCpY9x4dvw==",
"requested": "[1.0.0-rc9, )",
"resolved": "1.0.0-rc9",
"contentHash": "UjhPUohYL8hiMCwvJGQ0IZ5ALcgesonhTGMPO9f2ZjbOMLyHtIdPZj3yeqWUxfX4RqkgKwRidvw9G9OQo61BQA==",
"dependencies": {
"SlimDX": "4.0.13.44",
"UnembeddedResources": "1.0.0"
Expand Down
21 changes: 0 additions & 21 deletions Extension/Extension.csproj

This file was deleted.

45 changes: 0 additions & 45 deletions MapPlugin/MapPlugin.cs

This file was deleted.

25 changes: 0 additions & 25 deletions MapPlugin/Properties/AssemblyInfo.cs

This file was deleted.

Loading
Loading