Merge branch 'master' of github.com:Cyl18/CardSharp

Cyl18 · Mar 20, 2018 · 0b966fd · 0b966fd
2 parents 8061b5b + f46d0cd
commit 0b966fd
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/CardSharp/CardSharp.csproj b/CardSharp/CardSharp.csproj
@@ -47,6 +47,7 @@
     </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>

diff --git a/CardSharp/Constants.cs b/CardSharp/Constants.cs
@@ -6,8 +6,8 @@ public class Constants
         public const int AmountCardNum = 4; /*每种牌4张*/
         public const int MaxPlayer = 3; /*最多3人*/
         public const string ConfigDir = "CardSharp";
-        public const int PointAdd = 10000;
-        public const int BaseScore = 1000;
+        public const long PointAdd = 10000;
+        public const long BaseScore = 1000;
         public const int BoardcastCardNumThreshold = 5;
 
         public class Cards

diff --git a/CardSharp/GameComponents/Desk.cs b/CardSharp/GameComponents/Desk.cs
@@ -274,7 +274,7 @@ public void FinishGame(Player player)
             {
                 AddMessageLine("SDDC duel done.");
 
-                int result = 0;
+                long result = 0;
                 switch (player.Type) {
                     case PlayerType.Farmer:
                         AddMessageLine("Winners are farmers.");
@@ -317,7 +317,7 @@ public void FinishGame(Player player)
             FinishGame(true);
         }
 
-        private int SaveSddc(IEnumerable<Player> winners, IEnumerable<Player> losers)
+        private long SaveSddc(IEnumerable<Player> winners, IEnumerable<Player> losers)
         {
             var winnersConfig = winners.Select(PlayerConfig.GetConfig).ToList();
             var losersConfig = losers.Select(PlayerConfig.GetConfig).ToList();
@@ -331,7 +331,7 @@ private int SaveSddc(IEnumerable<Player> winners, IEnumerable<Player> losers)
             return score;
         }
 
-        private void SaveScore(PlayerConfig p, int value)
+        private void SaveScore(PlayerConfig p, long value)
         {
             var playerConf = p;
             playerConf.Point = value;

diff --git a/CardSharp/GameComponents/IPlayerConfig.cs b/CardSharp/GameComponents/IPlayerConfig.cs
@@ -1,12 +1,15 @@
 using System;
+using System.Numerics;
+using Newtonsoft.Json;
 
 namespace CardSharp.GameComponents
 {
     public interface IPlayerConfig
     {
         DateTime LastTime { get; set; }
-        int Point { get; set; }
+        long Point { get; set; }
         string PlayerID { get; }
         bool IsAdmin { get; }
     }
+
 }
diff --git a/CardSharp/GameComponents/Multiplier.cs b/CardSharp/GameComponents/Multiplier.cs
@@ -18,9 +18,9 @@ public static void Multiplie(Desk desk, IRule rule)
             }
         }
 
-        public static int CalcResult(Desk desk)
+        public static long CalcResult(Desk desk)
         {
-            return (int) Math.Pow(2, desk.Multiplier) * Constants.BaseScore;
+            return (long) Math.Pow(2, desk.Multiplier) * Constants.BaseScore;
         }
     }
 }
diff --git a/CardSharp/GameComponents/PlayerConfig.cs b/CardSharp/GameComponents/PlayerConfig.cs
@@ -10,7 +10,7 @@ static PlayerConfig()
             if (!Directory.Exists(Constants.ConfigDir)) Directory.CreateDirectory(Constants.ConfigDir);
         }
 
-        public PlayerConfig(string playerid, int point = default, DateTime lastTime = default, bool isAdmin = default )
+        public PlayerConfig(string playerid, long point = default, DateTime lastTime = default, bool isAdmin = default )
         {
             PlayerID = playerid ?? throw new ArgumentNullException(nameof(playerid));
             Point = point;
@@ -19,7 +19,7 @@ static PlayerConfig()
         }
 
         public string PlayerID { get; }
-        public int Point { get; set; }
+        public long Point { get; set; }
         public DateTime LastTime { get; set; }
 
         private bool _isAdmin = false;

diff --git a/CardSharp/GameSteps/WaitingParser.cs b/CardSharp/GameSteps/WaitingParser.cs
@@ -12,10 +12,10 @@ public void Parse(Desk desk, Player player, string command)
                 case "上桌":
                 case "fork table":
                 case "法克忒薄": // By Charlie Jiang
-                    //var point = PlayerConfig.GetConfig(player).Point;
-                    //if (point <= 0)
-                    //    desk.AddMessage($"你的积分不足以进行游戏! 你现在有{point}点积分.");
-                    //else
+                    var point = PlayerConfig.GetConfig(player).Point;
+                    if (point <= -100000)
+                        desk.AddMessage($"CNM 这里是CY 你们的印钞厂停业了.");
+                    else
                         desk.AddPlayer(player);
                     break;
                 case "下桌":
@@ -41,7 +41,7 @@ public void Parse(Desk desk, Player player, string command)
                     break;
             }
 
-            if (command.StartsWith("开始游戏 "))
+            if (command.StartsWith("开始游戏 ") && PlayerConfig.GetConfig(player).IsAdmin)
             {
                 var seed = int.Parse(command.Substring(5));
                 if (desk.PlayerList.Count == 3)