tl 2 سال پیش
والد
کامیت
1385dfadfa
2فایلهای تغییر یافته به همراه11 افزوده شده و 3 حذف شده
  1. 2 2
      game/qznn/nn.go
  2. 9 1
      game/qznn/wait.go

+ 2 - 2
game/qznn/nn.go

@@ -58,12 +58,12 @@ func WinLevel(leftNum, rightNum []uint32) (bool, bool, int) {
 			}
 
 			if suitLeft < suitRight {
-				return false, false, 3
+				return false, false, 0
 			}
 		}
 
 		if maxLeft < maxRight {
-			return false, false, 3
+			return false, false, 0
 		}
 	}
 

+ 9 - 1
game/qznn/wait.go

@@ -335,7 +335,10 @@ func (p *Game) WaitOpen(room Room) error {
 			var isWin bool
 			var winAmount decimal.Decimal
 			userCardList := GetNNCardList(userItem.CardList)
-			masterWin, _, cardLevel := WinLevel(masterCardList, userCardList)
+			masterWin, isEqual, cardLevel := WinLevel(masterCardList, userCardList)
+			if cardLevel == 0 {
+				cardLevel = 1
+			}
 
 			if !masterWin {
 				isWin = true
@@ -349,6 +352,11 @@ func (p *Game) WaitOpen(room Room) error {
 				winAmount = room.BaseAmount.Mul(decimal.NewFromInt(int64(masterPlayerItem.MasterMul))).Mul(decimal.NewFromInt(int64(userItem.Mul))).Mul(decimal.NewFromInt(-1)).Mul(decimal.NewFromInt(int64(cardLevel)))
 			}
 
+			if isEqual {
+				isWin = false
+				winAmount = decimal.NewFromInt(0)
+			}
+
 			err = tx.Model(model.User{}).Where("id = ? and balance + ? > 0", userID, winAmount).
 				Update("balance", gorm.Expr("balance + ?", winAmount)).Error
 			if err != nil {