fix 十三张牌局记录税收比例

data/DB_GameRule.json

@@ -71,7 +71,7 @@
 			"Name": "十三张(四人场)",
 			"GameId": 211,
 			"Params": [
-				0,
+				4,
 				0,
 				30,
 				50,
@@ -84,7 +84,7 @@
 			"Name": "十三张(八人场)",
 			"GameId": 212,
 			"Params": [
-				1,
+				8,
 				0,
 				30,
 				50,
@@ -97,7 +97,7 @@
 			"Name": "十三张(自由场经典场)",
 			"GameId": 213,
 			"Params": [
-				1,
+				8,
 				0,
 				30,
 				50,
@@ -110,7 +110,7 @@
 			"Name": "十三张(自由场癞子场)",
 			"GameId": 214,
 			"Params": [
-				1,
+				8,
 				0,
 				30,
 				50,
@@ -250,6 +250,18 @@
 			"GameId": 312,
 			"GameDif": "312"
 		},
+		{
+			"Id": 31300,
+			"Name": "CashMania",
+			"GameId": 313,
+			"GameDif": "313"
+		},
+		{
+			"Id": 31400,
+			"Name": "GatesOfOlympus",
+			"GameId": 314,
+			"GameDif": "314"
+		},
 		{
 			"Id": 60800,
 			"Name": "娃娃机",

gamesrv/base/scene.go

@@ -1471,7 +1471,7 @@ func (this *Scene) SaveGameDetailedLog(param *SaveGameDetailedParam) {
 		return
 	}
 
-	if param.GameTime < 0 {
+	if param.GameTime <= 0 {
 		param.GameTime = int64(time.Now().Sub(this.GameNowTime).Seconds())
 	}
 

gamesrv/thirteen/scenepolicy.go

@@ -1334,7 +1334,7 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 					RoomType:   sceneEx.GetSceneType(),
 					BaseScore:  int32(sceneEx.GetBaseScore()),
 					NowRound:   int32(sceneEx.NumOfGames),
-					ClubRate:   sceneEx.Scene.PumpCoin,
+					TaxRate:    s.GetDBGameFree().GetTaxRate(),
 				}
 				var person []model.ThirteenWaterPerson
 				for _, o_player := range sceneEx.players {

model/gamelogtype.go

@@ -168,8 +168,8 @@ type ThirteenWaterType struct {
 	NowRound    int32                 //当前局数
 	PlayerCount int                   //玩家数量
 	BaseScore   int32                 //底分
+	TaxRate     int32                 //税率（万分比）
 	PlayerData  []ThirteenWaterPerson //玩家信息
-	ClubRate    int32                 //俱乐部抽水比例
 }
 
 type ThirteenWaterPoker struct {

protocol/server/pbdata.proto

@@ -715,129 +715,127 @@ message DB_GameFree {
 
 	int32 SceneAdd = 11;
 
-	string Desc = 12;
+	int32 ShowType = 12;
 
-	int32 ShowType = 13;
+	int32 SubShowType = 13;
 
-	int32 SubShowType = 14;
+	int32 Flag = 14;
 
-	int32 Flag = 15;
+	int32 TestTakeCoin = 15;
 
-	int32 TestTakeCoin = 16;
+	int32 ShowId = 16;
 
-	int32 ShowId = 17;
+	int64 LimitCoin = 17;
 
-	int64 LimitCoin = 18;
+	int64 MaxCoinLimit = 18;
 
-	int64 MaxCoinLimit = 19;
+	int32 ServiceFee = 19;
 
-	int32 ServiceFee = 20;
+	int64 LowerThanKick = 20;
 
-	int64 LowerThanKick = 21;
+	int32 BaseScore = 21;
 
-	int32 BaseScore = 22;
+	int32 Turn = 22;
 
-	int32 Turn = 23;
+	string BetDec = 23;
 
-	string BetDec = 24;
+	int32 Bot = 24;
 
-	int32 Bot = 25;
+	repeated int32 Ai = 25;
 
-	repeated int32 Ai = 26;
+	int32 Banker = 26;
 
-	int32 Banker = 27;
+	int32 MaxChip = 27;
 
-	int32 MaxChip = 28;
+	repeated int64 OtherIntParams = 28;
 
-	repeated int64 OtherIntParams = 29;
+	repeated int64 ChessScoreParams = 29;
 
-	repeated int64 ChessScoreParams = 30;
+	repeated int64 RankScoreParams = 30;
 
-	repeated int64 RankScoreParams = 31;
+	repeated int32 Jackpot = 31;
 
-	repeated int32 Jackpot = 32;
+	repeated int32 RobotNumRng = 32;
 
-	repeated int32 RobotNumRng = 33;
+	repeated int64 RobotTakeCoin = 33;
 
-	repeated int64 RobotTakeCoin = 34;
+	repeated int64 RobotLimitCoin = 34;
 
-	repeated int64 RobotLimitCoin = 35;
+	int32 BetLimit = 35;
 
-	int32 BetLimit = 36;
+	int32 TaxRate = 36;
 
-	int32 TaxRate = 37;
+	int32 SameIpLimit = 37;
 
-	int32 SameIpLimit = 38;
+	int32 SamePlaceLimit = 38;
 
-	int32 SamePlaceLimit = 39;
+	string GameDif = 39;
 
-	string GameDif = 40;
+	int32 GameClass = 40;
 
-	int32 GameClass = 41;
+	string PlatformName = 41;
 
-	string PlatformName = 42;
+	repeated int32 MaxBetCoin = 42;
 
-	repeated int32 MaxBetCoin = 43;
+	int32 PlayNumLimit = 43;
 
-	int32 PlayNumLimit = 44;
+	int32 CreateRoomNum = 44;
 
-	int32 CreateRoomNum = 45;
+	int32 MatchTrueMan = 45;
 
-	int32 MatchTrueMan = 46;
+	int32 PlayerWaterRate = 46;
 
-	int32 PlayerWaterRate = 47;
+	int32 MatchMode = 47;
 
-	int32 MatchMode = 48;
+	int32 KillingRate = 48;
 
-	int32 KillingRate = 49;
+	int32 BetWaterRate = 49;
 
-	int32 BetWaterRate = 50;
+	int32 Lottery = 50;
 
-	int32 Lottery = 51;
+	string LotteryConfig = 51;
 
-	string LotteryConfig = 52;
+	repeated int32 BalanceLine = 52;
 
-	repeated int32 BalanceLine = 53;
+	int32 JackpotRatio = 53;
 
-	int32 JackpotRatio = 54;
+	int32 JackpotMin = 54;
 
-	int32 JackpotMin = 55;
+	repeated int32 ChessGradeLimit = 55;
 
-	repeated int32 ChessGradeLimit = 56;
+	int32 LeaveDeduct = 56;
 
-	int32 LeaveDeduct = 57;
+	int32 LeaveCombat = 57;
 
-	int32 LeaveCombat = 58;
+	int32 IntuseCannonMin = 58;
 
-	int32 IntuseCannonMin = 59;
+	int32 IntuseCannonMax = 59;
 
-	int32 IntuseCannonMax = 60;
+	int32 BossDrainageBet = 60;
 
-	int32 BossDrainageBet = 61;
+	int32 Draw = 61;
 
-	int32 Draw = 62;
+	int64 Fluctuate = 62;
 
-	int64 Fluctuate = 63;
+	string FluctuateMax = 63;
 
-	string FluctuateMax = 64;
+	int32 Ratio = 64;
 
-	int32 Ratio = 65;
+	int64 MinValue = 65;
 
-	int64 MinValue = 66;
+	int64 MaxValue = 66;
 
-	int64 MaxValue = 67;
+	int32 DrainageBet = 67;
 
-	int32 DrainageBet = 68;
+	int32 DiamondDrop = 68;
 
-	int32 DiamondDrop = 69;
+	int32 NegativeMax = 69;
 
-	int32 NegativeMax = 70;
+	int32 RatioMax = 70;
 
-	int32 RatioMax = 71;
+	int32 IsDrop = 71;
 
-	int32 IsDrop = 72;
+	int32 IsCustom = 72;
-
-	int32 IsCustom = 73;
 
 }