Skip to content
This repository was archived by the owner on Jul 27, 2018. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Cyl18/CardSharp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: untagged-78fb2b8a6d715aa670fe
Choose a base ref
...
head repository: Cyl18/CardSharp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Apr 24, 2018

  1. .

    TheRealKamisama authored Apr 24, 2018
    Copy the full SHA
    f0c36db View commit details
  2. .

    TheRealKamisama authored Apr 24, 2018
    Copy the full SHA
    2b21383 View commit details
  3. .

    TheRealKamisama committed Apr 24, 2018
    Copy the full SHA
    dc214bf View commit details
  4. .

    TheRealKamisama committed Apr 24, 2018
    Copy the full SHA
    d6675d1 View commit details
  5. ;

    TheRealKamisama committed Apr 24, 2018
    Copy the full SHA
    f1d2c1b View commit details
  6. byks

    TheRealKamisama committed Apr 24, 2018
    Copy the full SHA
    1b01c00 View commit details
  7. .

    TheRealKamisama committed Apr 24, 2018
    Copy the full SHA
    dfec536 View commit details

Commits on Apr 28, 2018

  1. no more qipai

    TheRealKamisama committed Apr 28, 2018
    Copy the full SHA
    f6c438d View commit details

Commits on May 4, 2018

  1. int to long

    Cyl18 committed May 4, 2018
    Copy the full SHA
    390398a View commit details
  2. Copy the full SHA
    39b8d94 View commit details

Commits on May 8, 2018

  1. add scoreboard

    Cyl18 committed May 8, 2018
    Copy the full SHA
    a7b8e2a View commit details
  2. 调整输光的下限

    Cyl18 committed May 8, 2018
    Copy the full SHA
    827d379 View commit details
  3. 把全角引号改成半角

    Cyl18 committed May 8, 2018
    Copy the full SHA
    3d8e446 View commit details
  4. 加入commit信息

    Cyl18 committed May 8, 2018
    Copy the full SHA
    cfb7332 View commit details
  5. fix tls connection problem

    Cyl18 committed May 8, 2018
    Copy the full SHA
    49d8a3a View commit details
  6. fix json parse problem

    Cyl18 committed May 8, 2018
    Copy the full SHA
    de60f9b View commit details

Commits on May 9, 2018

  1. Copy the full SHA
    3378e7d View commit details

Commits on May 18, 2018

  1. Copy the full SHA
    adfd301 View commit details

Commits on Jul 21, 2018

  1. fuck newbe.mahua

    Cyl18 committed Jul 21, 2018
    Copy the full SHA
    367a8c5 View commit details
  2. Copy the full SHA
    267b732 View commit details
  3. Copy the full SHA
    3662bd6 View commit details

Commits on Jul 22, 2018

  1. 修改获取积分细节

    Cyl18 committed Jul 22, 2018
    Copy the full SHA
    28210a4 View commit details

Commits on Jul 27, 2018

  1. Update README.md

    Cyl18 authored Jul 27, 2018
    Copy the full SHA
    c481c92 View commit details
Showing with 847 additions and 222 deletions.
  1. +4 −4 CardSharp.GUI/App.config
  2. +2 −1 CardSharp.GUI/CardSharp.GUI.csproj
  3. +11 −10 CardSharp.Tests/CardSharp.Tests.csproj
  4. +2 −2 CardSharp.Tests/packages.config
  5. +1 −1 CardSharp/App.config
  6. +10 −8 CardSharp/CardSharp.csproj
  7. +121 −0 CardSharp/CommitsGetter.cs
  8. +1 −1 CardSharp/Constants.cs
  9. +23 −17 CardSharp/GameComponents/Desk.cs
  10. +21 −3 CardSharp/GameComponents/PlayerConfig.cs
  11. +5 −10 CardSharp/GameSteps/CommandParser.cs
  12. +7 −7 CardSharp/GameSteps/LandlordDiscuss.cs
  13. +120 −35 CardSharp/GameSteps/StandardParser.cs
  14. +18 −2 CardSharp/GameSteps/WaitingParser.cs
  15. +100 −0 CardSharp/ReleaseGetter.cs
  16. +45 −45 CardSharp/packages.config
  17. BIN Origind.Card.Game/NewbeLibs/Framework/Autofac.dll
  18. BIN Origind.Card.Game/NewbeLibs/Framework/Extensions/Administration/Newbe.Mahua.Administration.WPF.dll
  19. BIN Origind.Card.Game/NewbeLibs/Framework/MessagePack.dll
  20. +20 −34 Origind.Card.Game/NewbeLibs/Framework/NLog.config
  21. BIN Origind.Card.Game/NewbeLibs/Framework/NLog.dll
  22. BIN Origind.Card.Game/NewbeLibs/Framework/Newbe.Mahua.PluginLoader.dll
  23. BIN Origind.Card.Game/NewbeLibs/Framework/Newbe.Mahua.dll
  24. +265 −2 Origind.Card.Game/NewbeLibs/Framework/Newbe.Mahua.xml
  25. BIN Origind.Card.Game/NewbeLibs/Framework/System.ValueTuple.dll
  26. BIN Origind.Card.Game/NewbeLibs/Platform/Amanda/CLR/Newbe.Mahua.Amanda.Native.dll
  27. BIN Origind.Card.Game/NewbeLibs/Platform/Amanda/CLR/Newbe.Mahua.Amanda.dll
  28. BIN Origind.Card.Game/NewbeLibs/Platform/Amanda/Native/Newbe.Mahua.Amanda.Native.dll
  29. BIN Origind.Card.Game/NewbeLibs/Platform/CQP/CLR/Newbe.Mahua.CQP.Native.dll
  30. BIN Origind.Card.Game/NewbeLibs/Platform/CQP/CLR/Newbe.Mahua.CQP.dll
  31. BIN Origind.Card.Game/NewbeLibs/Platform/CQP/Native/Newbe.Mahua.CQP.Native.dll
  32. +28 −17 Origind.Card.Game/Origind.Card.Game.csproj
  33. +19 −0 Origind.Card.Game/app.config
  34. +2 −3 Origind.Card.Game/build.bat
  35. +4 −4 Origind.Card.Game/build.ps1
  36. BIN Origind.Card.Game/buildTools/nuget.exe
  37. +2 −3 Origind.Card.Game/buildTools/packages.config
  38. +15 −13 Origind.Card.Game/packages.config
  39. +1 −0 README.md
8 changes: 4 additions & 4 deletions CardSharp.GUI/App.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
<runtime>
<gcServer enabled="true" />
<gcServer enabled="true"/>
</runtime>
</configuration>
</configuration>
3 changes: 2 additions & 1 deletion CardSharp.GUI/CardSharp.GUI.csproj
Original file line number Diff line number Diff line change
@@ -8,11 +8,12 @@
<OutputType>Exe</OutputType>
<RootNamespace>CardSharp.GUI</RootNamespace>
<AssemblyName>CardSharp.GUI</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
21 changes: 11 additions & 10 deletions CardSharp.Tests/CardSharp.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CardSharp.Tests</RootNamespace>
<AssemblyName>CardSharp.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,6 +19,7 @@
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,10 +40,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -54,23 +55,23 @@
<Compile Include="UnitTest2.cs" />
<Compile Include="UnitTest3.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CardSharp\CardSharp.csproj">
<Project>{90d28a68-f43b-4127-8166-3f54fac05c6a}</Project>
<Name>CardSharp</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" />
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
</Project>
4 changes: 2 additions & 2 deletions CardSharp.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net461" />
<package id="MSTest.TestFramework" version="1.2.0" targetFramework="net461" />
<package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net462" />
<package id="MSTest.TestFramework" version="1.3.2" targetFramework="net462" />
</packages>
2 changes: 1 addition & 1 deletion CardSharp/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
</configuration>
18 changes: 10 additions & 8 deletions CardSharp/CardSharp.csproj
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>CardSharp</RootNamespace>
<AssemblyName>CardSharp</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
@@ -40,30 +40,31 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="Humanizer, Version=2.2.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
<HintPath>..\packages\Humanizer.Core.2.2.0\lib\netstandard1.0\Humanizer.dll</HintPath>
<Reference Include="Humanizer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
<HintPath>..\packages\Humanizer.Core.2.4.2\lib\netstandard2.0\Humanizer.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Z.ExtensionMethods, Version=2.0.13.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
<HintPath>..\packages\Z.ExtensionMethods.2.0.13\lib\net45\Z.ExtensionMethods.dll</HintPath>
<Reference Include="Z.ExtensionMethods, Version=2.1.0.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
<HintPath>..\packages\Z.ExtensionMethods.2.1.0\lib\net45\Z.ExtensionMethods.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CardCounter.cs" />
<Compile Include="CommitsGetter.cs" />
<Compile Include="GameComponents\CardGroup.cs" />
<Compile Include="CardGroupExtensions.cs" />
<Compile Include="GameComponents\Card.cs" />
@@ -90,6 +91,7 @@
<Compile Include="GameComponents\Player.cs" />
<Compile Include="MessageSenderBase.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ReleaseGetter.cs" />
<Compile Include="Rules\Chain.cs" />
<Compile Include="Rules\IRule.cs" />
<Compile Include="Rules\Rule3.cs" />
121 changes: 121 additions & 0 deletions CardSharp/CommitsGetter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;

namespace CardSharp
{
public static class CommitsGetter
{
public static CommitData[] Get()
{
ServicePointManager.Expect100Continue = true;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var wc = new WebClient { Encoding = Encoding.UTF8 };
wc.Headers.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36");
return wc.DownloadString("https://api.github.com/repos/Cyl18/CardSharp/commits").JsonDeserialize<CommitData[]>();
}
}

public class CommitData
{
public string sha { get; set; }
public Commit commit { get; set; }
public string url { get; set; }
public string html_url { get; set; }
public string comments_url { get; set; }
public Author1 author { get; set; }
public Committer1 committer { get; set; }
public Parent[] parents { get; set; }
}

public class Commit
{
public Author author { get; set; }
public Committer committer { get; set; }
public string message { get; set; }
public Tree tree { get; set; }
public string url { get; set; }
public int comment_count { get; set; }
public Verification verification { get; set; }
}

public class Author
{
public string name { get; set; }
public string email { get; set; }
public DateTime date { get; set; }
}

public class Committer
{
public string name { get; set; }
public string email { get; set; }
public DateTime date { get; set; }
}

public class Tree
{
public string sha { get; set; }
public string url { get; set; }
}

public class Verification
{
public bool verified { get; set; }
public string reason { get; set; }
public string signature { get; set; }
public string payload { get; set; }
}

public class Author1
{
public string login { get; set; }
public int id { get; set; }
public string avatar_url { get; set; }
public string gravatar_id { get; set; }
public string url { get; set; }
public string html_url { get; set; }
public string followers_url { get; set; }
public string following_url { get; set; }
public string gists_url { get; set; }
public string starred_url { get; set; }
public string subscriptions_url { get; set; }
public string organizations_url { get; set; }
public string repos_url { get; set; }
public string events_url { get; set; }
public string received_events_url { get; set; }
public string type { get; set; }
public bool site_admin { get; set; }
}

public class Committer1
{
public string login { get; set; }
public int id { get; set; }
public string avatar_url { get; set; }
public string gravatar_id { get; set; }
public string url { get; set; }
public string html_url { get; set; }
public string followers_url { get; set; }
public string following_url { get; set; }
public string gists_url { get; set; }
public string starred_url { get; set; }
public string subscriptions_url { get; set; }
public string organizations_url { get; set; }
public string repos_url { get; set; }
public string events_url { get; set; }
public string received_events_url { get; set; }
public string type { get; set; }
public bool site_admin { get; set; }
}

public class Parent
{
public string sha { get; set; }
public string url { get; set; }
public string html_url { get; set; }
}
}
2 changes: 1 addition & 1 deletion CardSharp/Constants.cs
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ public class Constants
public const int AmountCardNum = 4; /*每种牌4张*/
public const int MaxPlayer = 3; /*最多3人*/
public const string ConfigDir = "CardSharp";
public const long PointAdd = 10000;
public const long PointAdd = 20000;
public const long BaseScore = 1000;
public const int BoardcastCardNumThreshold = 5;

Loading