Commit 18f1ed6f by liulongfei

项目调整

parent e2f651d3
......@@ -31,6 +31,24 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\VIZ.TVP\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
......
......@@ -570,9 +570,9 @@ namespace VIZ.Framework.TVP.Golf
{
if ((state.mBallCount == 0) && (this.BallCount != 0)) // The ball disappeared (perhaps it was hit)
{
if (!mNewShotReceived) // there may have been a misfire (a "new shot" event is not sent after a misfire)
Application.Current.Dispatcher.Invoke(new Action(() => { GetFlashStatistics(); GetShotCount(); }));
mNewShotReceived = false; // reset when ball count = 0 (guaranteed after a new shot - okay if just moved out of view)
//if (!mNewShotReceived) // there may have been a misfire (a "new shot" event is not sent after a misfire)
// Application.Current.Dispatcher.Invoke(new Action(() => { GetFlashStatistics(); GetShotCount(); }));
//mNewShotReceived = false; // reset when ball count = 0 (guaranteed after a new shot - okay if just moved out of view)
}
// 更新球数量
......
......@@ -31,6 +31,24 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
......
......@@ -272,8 +272,8 @@ Global
{6FBD7D1A-C16E-486B-A98C-727C09E514B8}.Release|x86.Build.0 = Release|Any CPU
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Debug|x64.ActiveCfg = Debug|Any CPU
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Debug|x64.Build.0 = Debug|Any CPU
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Debug|x64.ActiveCfg = Debug|x64
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Debug|x64.Build.0 = Debug|x64
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Debug|x86.ActiveCfg = Debug|Any CPU
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Debug|x86.Build.0 = Debug|Any CPU
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -284,8 +284,8 @@ Global
{3E7AF8B3-24AA-44EE-A242-30E4E3DCC20C}.Release|x86.Build.0 = Release|Any CPU
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x64.ActiveCfg = Debug|Any CPU
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x64.Build.0 = Debug|Any CPU
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x64.ActiveCfg = Debug|x64
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x64.Build.0 = Debug|x64
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x86.ActiveCfg = Debug|Any CPU
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Debug|x86.Build.0 = Debug|Any CPU
{39A3CDBE-2132-4C71-BF2F-F99A9E966109}.Release|Any CPU.ActiveCfg = Release|Any CPU
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment