data/DB_GameFree.json

@@ -6390,39 +6390,6 @@
 			],
 			"PlayerWaterRate": 100,
 			"BetWaterRate": 100
-		},
-		{
-			"Id": 6080001,
-			"Name": "娃娃机",
-			"Title": "1",
-			"GameId": 608,
-			"GameRule": 60800,
-			"GameType": 1,
-			"SceneType": 1,
-			"Desc": "0",
-			"ShowType": 3,
-			"ShowId": 60800,
-			"BaseScore": 1000,
-			"Turn": 60800,
-			"BetDec": "1000",
-			"Ai": [
-				0
-			],
-			"OtherIntParams": [
-				0
-			],
-			"RobotNumRng": [
-				0
-			],
-			"SameIpLimit": 1,
-			"GameDif": "608",
-			"GameClass": 2,
-			"PlatformName": "越南棋牌",
-			"MaxBetCoin": [
-				0
-			],
-			"PlayerWaterRate": 100,
-			"BetWaterRate": 100
 		}
 	]
 }

data/DB_GameRule.json

@@ -195,11 +195,6 @@
 			"Name": "多财多福",
 			"GameId": 307,
 			"GameDif": "307"
-		},
-		{
-			"Id": 60800,
-			"Name": "娃娃机",
-			"GameId": 608
 		}
 	]
 }

worldsrv/matchcontext.go

@@ -40,19 +40,19 @@ func (p MatchContextSlice) Sort(isFinals bool) {
 	for i, mc := range p {
 		mc.rank = int32(i + 1)
 	}
-	//if isFinals {
-	//	// 积分相同名次相同
-	//	lastRank := int32(0)
-	//	lastGrade := int32(0)
-	//	for i := 0; i < len(p); i++ {
-	//		mc := p[i]
-	//		if i > 0 && mc.grade == lastGrade {
-	//			mc.rank = lastRank
-	//		}
-	//		lastRank = mc.rank
-	//		lastGrade = mc.grade
-	//	}
-	//}
+	if isFinals {
+		// 积分相同名次相同
+		lastRank := int32(0)
+		lastGrade := int32(0)
+		for i := 0; i < len(p); i++ {
+			mc := p[i]
+			if i > 0 && mc.grade == lastGrade {
+				mc.rank = lastRank
+			}
+			lastRank = mc.rank
+			lastGrade = mc.grade
+		}
+	}
 }
 
 func NewMatchContext(p *Player, tm *TmMatch, grade, snid, lv, roleId, skinId int32, seq int) *PlayerMatchContext {

worldsrv/player.go

@@ -3925,7 +3925,6 @@ func (this *Player) VIPDraw(id, vip int32) {
 					ItemNum: v,
 				})
 				itemInfo = append(itemInfo, model.ItemInfo{ItemId: int32(k), ItemNum: v})
-				pack.Award[k] = v
 			}
 			BagMgrSingleton.AddItemsV2(&ItemParam{
 				P:        this,