Skip to content

Commit 93097d3

Browse files
chenxuuuchenxuuu
committed
稍微更改定时器逻辑
1 parent 8d9e4a6 commit 93097d3

File tree

4 files changed

+23
-22
lines changed

4 files changed

+23
-22
lines changed

‎llcom/LuaEnv/LuaRunEnv.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,16 @@ private static void runTigger()
6969
{
7070
try
7171
{
72-
lua.Global.Get<XLua.LuaFunction>("tiggerCB").Call(toRun[0].id, toRun[0].type, toRun[0].data);
72+
var temp = toRun[0];
73+
toRun.RemoveAt(0);
74+
lua.Global.Get<XLua.LuaFunction>("tiggerCB").Call(temp.id, temp.type, temp.data);
7375
}
7476
catch(Exception le)
7577
{
7678
LuaApis.PrintLog("回调报错：\r\n" + le.ToString());
7779
}
7880
if (tokenSource.IsCancellationRequested)
7981
return;
80-
toRun.RemoveAt(0);
8182
}
8283
}
8384
}

‎llcom/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎llcom/llcom.csproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Costura.Fody.4.0.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.0.0\build\Costura.Fody.props')" />
3+
<Import Project="..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -88,14 +88,14 @@
8888
<Reference Include="AdonisUI.ClassicTheme, Version=1.11.0.0, Culture=neutral, processorArchitecture=MSIL">
8989
<HintPath>..\packages\AdonisUI.ClassicTheme.1.11.0\lib\net40\AdonisUI.ClassicTheme.dll</HintPath>
9090
</Reference>
91-
<Reference Include="AutoUpdater.NET, Version=1.5.3.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
92-
<HintPath>..\packages\Autoupdater.NET.Official.1.5.3\lib\net40\AutoUpdater.NET.dll</HintPath>
91+
<Reference Include="AutoUpdater.NET, Version=1.5.7.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
92+
<HintPath>..\packages\Autoupdater.NET.Official.1.5.7\lib\net40\AutoUpdater.NET.dll</HintPath>
9393
</Reference>
94-
<Reference Include="Costura, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
95-
<HintPath>..\packages\Costura.Fody.4.0.0\lib\net40\Costura.dll</HintPath>
94+
<Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
95+
<HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
9696
</Reference>
97-
<Reference Include="CrashReporter.NET, Version=1.5.7.0, Culture=neutral, PublicKeyToken=7828e0fd88cab698, processorArchitecture=MSIL">
98-
<HintPath>..\packages\CrashReporter.NET.Official.1.5.7\lib\net462\CrashReporter.NET.dll</HintPath>
97+
<Reference Include="CrashReporter.NET, Version=1.5.8.0, Culture=neutral, PublicKeyToken=7828e0fd88cab698, processorArchitecture=MSIL">
98+
<HintPath>..\packages\CrashReporter.NET.Official.1.5.8\lib\net462\CrashReporter.NET.dll</HintPath>
9999
</Reference>
100100
<Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL">
101101
<HintPath>..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath>
@@ -201,13 +201,6 @@
201201
<EmbeddedResource Include="costura32\xlua.dll" />
202202
</ItemGroup>
203203
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
204-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
205-
<PropertyGroup>
206-
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
207-
</PropertyGroup>
208-
<Error Condition="!Exists('..\packages\Costura.Fody.4.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.0.0\build\Costura.Fody.props'))" />
209-
<Error Condition="!Exists('..\packages\Fody.5.1.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.5.1.1\build\Fody.targets'))" />
210-
</Target>
211204
<Target Name="AfterBuild">
212205
<ItemGroup>
213206
<MoveToLibFolder Include="$(OutputPath)*.dll ; $(OutputPath)*.pdb ; $(OutputPath)*.xml" />
@@ -216,5 +209,12 @@
216209
<PropertyGroup>
217210
<PostBuildEvent>xcopy /e /r /y "$(ProjectDir)DefaultFiles" "$(SolutionDir)llcom\$(OutDir)"</PostBuildEvent>
218211
</PropertyGroup>
219-
<Import Project="..\packages\Fody.5.1.1\build\Fody.targets" Condition="Exists('..\packages\Fody.5.1.1\build\Fody.targets')" />
212+
<Import Project="..\packages\Fody.6.0.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.0\build\Fody.targets')" />
213+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
214+
<PropertyGroup>
215+
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
216+
</PropertyGroup>
217+
<Error Condition="!Exists('..\packages\Fody.6.0.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.0\build\Fody.targets'))" />
218+
<Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
219+
</Target>
220220
</Project>

‎llcom/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<packages>
33
<package id="AdonisUI" version="1.11.0" targetFramework="net472" />
44
<package id="AdonisUI.ClassicTheme" version="1.11.0" targetFramework="net472" />
5-
<package id="Autoupdater.NET.Official" version="1.5.3" targetFramework="net472" />
5+
<package id="Autoupdater.NET.Official" version="1.5.7" targetFramework="net472" />
66
<package id="AvalonEdit" version="5.0.4" targetFramework="net472" />
7-
<package id="Costura.Fody" version="4.0.0" targetFramework="net472" />
8-
<package id="CrashReporter.NET.Official" version="1.5.7" targetFramework="net472" />
9-
<package id="Fody" version="5.1.1" targetFramework="net472" developmentDependency="true" />
7+
<package id="Costura.Fody" version="4.1.0" targetFramework="net472" />
8+
<package id="CrashReporter.NET.Official" version="1.5.8" targetFramework="net472" />
9+
<package id="Fody" version="6.0.0" targetFramework="net472" developmentDependency="true" />
1010
<package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net472" />
1111
<package id="LibUsbDotNet" version="2.2.29" targetFramework="net472" />
1212
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />

0 commit comments

Comments
 (0)