fix reel

gamesrv/gatesofolympus/scenepolicy_gatesofolympus.go

@@ -215,7 +215,6 @@ func GatesOfOlympusCreateRoomInfoPacket(s *base.Scene, sceneEx *GatesOfOlympusSc
 	Response, err := slots.SlotsMgrSington.Enter(playerEx.SlotsSession, int64(s.GameId))
 	if err == nil {
 		data := assemble.DataToCli(Response).(assemble.TableInfo)
-		data.BetConfig.BetSize = data.BetConfig.BetSize[:6]
 		pi, _ := json.Marshal(data)
 		pack.PlayerInfo = string(pi)
 		if sceneEx.BetConfig == nil {

gamesrv/slotspkg/internal/exported/excel2go/base/gates_of_olympus.go

@@ -10,298 +10,244 @@ func init() {
 	GatesOfOlympusBetBetChangeList = map[int64]*structs.GatesOfOlympusBetBetChangeList{
 		0: {
 			Index: 0,
-			BetChangeList: 0.2,
+			BetChangeList: 2000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 0,
 		},
 		1: {
 			Index: 1,
-			BetChangeList: 0.4,
+			BetChangeList: 4000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 1,
 		},
 		2: {
 			Index: 2,
-			BetChangeList: 0.6,
+			BetChangeList: 6000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 2,
 		},
 		3: {
 			Index: 3,
-			BetChangeList: 0.8,
+			BetChangeList: 8000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 3,
 		},
 		4: {
 			Index: 4,
-			BetChangeList: 1,
+			BetChangeList: 10000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 4,
 		},
 		5: {
 			Index: 5,
-			BetChangeList: 1.2,
+			BetChangeList: 12000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 5,
 		},
 		6: {
 			Index: 6,
-			BetChangeList: 1.4,
+			BetChangeList: 14000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 6,
 		},
 		7: {
 			Index: 7,
-			BetChangeList: 1.6,
+			BetChangeList: 16000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 7,
 		},
 		8: {
 			Index: 8,
-			BetChangeList: 1.8,
+			BetChangeList: 18000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 8,
 		},
 		9: {
 			Index: 9,
-			BetChangeList: 2,
+			BetChangeList: 20000,
 			BetSizeIndex: 0,
 			BetLevelIndex: 9,
 		},
 		10: {
 			Index: 10,
-			BetChangeList: 4,
-			BetSizeIndex:  1,
-			BetLevelIndex: 1,
-		},
-		11: {
-			Index:         11,
-			BetChangeList: 6,
-			BetSizeIndex:  1,
-			BetLevelIndex: 2,
-		},
-		12: {
-			Index:         12,
-			BetChangeList: 8,
+			BetChangeList: 24000,
 			BetSizeIndex: 1,
 			BetLevelIndex: 3,
 		},
-		13: {
-			Index:         13,
-			BetChangeList: 10,
+		11: {
+			Index: 11,
+			BetChangeList: 30000,
 			BetSizeIndex: 1,
 			BetLevelIndex: 4,
 		},
+		12: {
+			Index: 12,
+			BetChangeList: 36000,
+			BetSizeIndex: 1,
+			BetLevelIndex: 5,
+		},
+		13: {
+			Index: 13,
+			BetChangeList: 40000,
+			BetSizeIndex: 2,
+			BetLevelIndex: 3,
+		},
 		14: {
 			Index: 14,
-			BetChangeList: 12,
+			BetChangeList: 42000,
 			BetSizeIndex: 1,
-			BetLevelIndex: 5,
+			BetLevelIndex: 6,
 		},
 		15: {
 			Index: 15,
-			BetChangeList: 14,
+			BetChangeList: 48000,
 			BetSizeIndex: 1,
-			BetLevelIndex: 6,
+			BetLevelIndex: 7,
 		},
 		16: {
 			Index: 16,
-			BetChangeList: 15,
-			BetSizeIndex:  4,
-			BetLevelIndex: 0,
+			BetChangeList: 50000,
+			BetSizeIndex: 2,
+			BetLevelIndex: 4,
 		},
 		17: {
 			Index: 17,
-			BetChangeList: 16,
+			BetChangeList: 54000,
 			BetSizeIndex: 1,
-			BetLevelIndex: 7,
+			BetLevelIndex: 8,
 		},
 		18: {
 			Index: 18,
-			BetChangeList: 18,
+			BetChangeList: 60000,
 			BetSizeIndex: 1,
-			BetLevelIndex: 8,
+			BetLevelIndex: 9,
 		},
 		19: {
 			Index: 19,
-			BetChangeList: 20,
-			BetSizeIndex:  1,
-			BetLevelIndex: 9,
-		},
-		20: {
-			Index:         20,
-			BetChangeList: 24,
-			BetSizeIndex:  2,
-			BetLevelIndex: 5,
-		},
-		21: {
-			Index:         21,
-			BetChangeList: 28,
+			BetChangeList: 70000,
 			BetSizeIndex: 2,
 			BetLevelIndex: 6,
 		},
-		22: {
-			Index:         22,
-			BetChangeList: 30,
-			BetSizeIndex:  3,
-			BetLevelIndex: 2,
-		},
-		23: {
-			Index:         23,
-			BetChangeList: 32,
+		20: {
+			Index: 20,
+			BetChangeList: 80000,
 			BetSizeIndex: 2,
 			BetLevelIndex: 7,
 		},
-		24: {
-			Index:         24,
-			BetChangeList: 36,
+		21: {
+			Index: 21,
+			BetChangeList: 90000,
 			BetSizeIndex: 2,
 			BetLevelIndex: 8,
 		},
-		25: {
-			Index:         25,
-			BetChangeList: 40,
+		22: {
+			Index: 22,
+			BetChangeList: 100000,
 			BetSizeIndex: 2,
 			BetLevelIndex: 9,
 		},
+		23: {
+			Index: 23,
+			BetChangeList: 120000,
+			BetSizeIndex: 3,
+			BetLevelIndex: 5,
+		},
+		24: {
+			Index: 24,
+			BetChangeList: 140000,
+			BetSizeIndex: 3,
+			BetLevelIndex: 6,
+		},
+		25: {
+			Index: 25,
+			BetChangeList: 160000,
+			BetSizeIndex: 3,
+			BetLevelIndex: 7,
+		},
 		26: {
 			Index: 26,
-			BetChangeList: 45,
-			BetSizeIndex:  4,
-			BetLevelIndex: 2,
+			BetChangeList: 180000,
+			BetSizeIndex: 3,
+			BetLevelIndex: 8,
 		},
 		27: {
 			Index: 27,
-			BetChangeList: 50,
+			BetChangeList: 200000,
 			BetSizeIndex: 3,
-			BetLevelIndex: 4,
+			BetLevelIndex: 9,
 		},
 		28: {
 			Index: 28,
-			BetChangeList: 60,
-			BetSizeIndex:  3,
+			BetChangeList: 240000,
+			BetSizeIndex: 4,
 			BetLevelIndex: 5,
 		},
 		29: {
 			Index: 29,
-			BetChangeList: 70,
-			BetSizeIndex:  3,
+			BetChangeList: 280000,
+			BetSizeIndex: 4,
 			BetLevelIndex: 6,
 		},
 		30: {
 			Index: 30,
-			BetChangeList: 75,
-			BetSizeIndex:  4,
-			BetLevelIndex: 4,
+			BetChangeList: 300000,
+			BetSizeIndex: 5,
+			BetLevelIndex: 2,
 		},
 		31: {
 			Index: 31,
-			BetChangeList: 80,
-			BetSizeIndex:  3,
+			BetChangeList: 320000,
+			BetSizeIndex: 4,
 			BetLevelIndex: 7,
 		},
 		32: {
 			Index: 32,
-			BetChangeList: 90,
-			BetSizeIndex:  3,
+			BetChangeList: 360000,
+			BetSizeIndex: 4,
 			BetLevelIndex: 8,
 		},
 		33: {
 			Index: 33,
-			BetChangeList: 100,
-			BetSizeIndex:  3,
+			BetChangeList: 400000,
+			BetSizeIndex: 4,
 			BetLevelIndex: 9,
 		},
 		34: {
 			Index: 34,
-			BetChangeList: 105,
-			BetSizeIndex:  4,
-			BetLevelIndex: 6,
-		},
-		35: {
-			Index:         35,
-			BetChangeList: 120,
-			BetSizeIndex:  4,
-			BetLevelIndex: 7,
-		},
-		36: {
-			Index:         36,
-			BetChangeList: 135,
-			BetSizeIndex:  4,
-			BetLevelIndex: 8,
-		},
-		37: {
-			Index:         37,
-			BetChangeList: 150,
-			BetSizeIndex:  4,
-			BetLevelIndex: 9,
-		},
-		38: {
-			Index:         38,
-			BetChangeList: 160,
-			BetSizeIndex:  5,
-			BetLevelIndex: 3,
-		},
-		39: {
-			Index:         39,
-			BetChangeList: 200,
+			BetChangeList: 500000,
 			BetSizeIndex: 5,
 			BetLevelIndex: 4,
 		},
-		40: {
-			Index:         40,
-			BetChangeList: 240,
+		35: {
+			Index: 35,
+			BetChangeList: 600000,
 			BetSizeIndex: 5,
 			BetLevelIndex: 5,
 		},
-		41: {
-			Index:         41,
-			BetChangeList: 280,
+		36: {
+			Index: 36,
+			BetChangeList: 700000,
 			BetSizeIndex: 5,
 			BetLevelIndex: 6,
 		},
-		42: {
-			Index:         42,
-			BetChangeList: 320,
+		37: {
+			Index: 37,
+			BetChangeList: 800000,
 			BetSizeIndex: 5,
 			BetLevelIndex: 7,
 		},
-		43: {
-			Index:         43,
-			BetChangeList: 360,
+		38: {
+			Index: 38,
+			BetChangeList: 900000,
 			BetSizeIndex: 5,
 			BetLevelIndex: 8,
 		},
-		44: {
-			Index:         44,
-			BetChangeList: 400,
+		39: {
+			Index: 39,
+			BetChangeList: 1000000,
 			BetSizeIndex: 5,
 			BetLevelIndex: 9,
 		},
-		45: {
-			Index:         45,
-			BetChangeList: 3,
-			BetSizeIndex:  6,
-			BetLevelIndex: 0,
-		},
-		46: {
-			Index:         46,
-			BetChangeList: 5,
-			BetSizeIndex:  7,
-			BetLevelIndex: 0,
-		},
-		47: {
-			Index:         47,
-			BetChangeList: 25,
-			BetSizeIndex:  8,
-			BetLevelIndex: 0,
-		},
-		48: {
-			Index:         48,
-			BetChangeList: 300,
-			BetSizeIndex:  9,
-			BetLevelIndex: 0,
-		},
 	}
 
 	GatesOfOlympusBetBetLevel = map[int64]*structs.GatesOfOlympusBetBetLevel{
@@ -358,43 +304,27 @@ func init() {
 	GatesOfOlympusBetBetSize = map[int64]*structs.GatesOfOlympusBetBetSize{
 		0: {
 			Index: 0,
-			BetSize: 100,
+			BetSize: 1000000,
 		},
 		1: {
 			Index: 1,
-			BetSize: 1000,
+			BetSize: 3000000,
 		},
 		2: {
 			Index: 2,
-			BetSize: 2000,
+			BetSize: 5000000,
 		},
 		3: {
 			Index: 3,
-			BetSize: 5000,
+			BetSize: 10000000,
 		},
 		4: {
 			Index: 4,
-			BetSize: 7500,
+			BetSize: 20000000,
 		},
 		5: {
 			Index: 5,
-			BetSize: 20000,
-		},
-		6: {
-			Index:   6,
-			BetSize: 1500,
-		},
-		7: {
-			Index:   7,
-			BetSize: 2500,
-		},
-		8: {
-			Index:   8,
-			BetSize: 12500,
-		},
-		9: {
-			Index:   9,
-			BetSize: 150000,
+			BetSize: 50000000,
 		},
 	}
 

gamesrv/slotspkg/slots/formation/formation.go

@@ -100,7 +100,7 @@ func (f *Formation) Rand(r *randx.Randx) {
 			symbol := reelDesc.Reel[symbolIdx%length]
 			f.Symbols = append(f.Symbols, symbol)
 		}
-		f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx+reelDesc.Range-1)%length])
+		f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx+length-1)%length])
 		f.SymbolsBelow = append(f.SymbolsBelow, reelDesc.Reel[(startIdx+reelDesc.Range)%length])
 	}
 }
@@ -119,7 +119,7 @@ func (f *Formation) ResetRandSymbols(r *randx.Randx) {
 			symbol := reelDesc.Reel[symbolIdx%length]
 			f.Symbols = append(f.Symbols, symbol)
 		}
-		f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx-1)%length])
+		f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx+length-1)%length])
 		f.SymbolsBelow = append(f.SymbolsBelow, reelDesc.Reel[(startIdx+reelDesc.Range)%length])
 	}
 }
@@ -137,7 +137,7 @@ func (f *Formation) ResetRandSymbolsByIndex(r *randx.Randx) {
 			symbol := reelDesc.Reel[symbolIdx%length]
 			f.Symbols = append(f.Symbols, symbol)
 		}
-		f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx-1)%length])
+		f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx-1+length)%length])
 		f.SymbolsBelow = append(f.SymbolsBelow, reelDesc.Reel[(startIdx+reelDesc.Range)%length])
 	}
 }