Compare commits

..

No commits in common. "0c1c2f533a34f37e3459e5102157012965352941" and "eb75f9769e7062a76b898bee7eabc277ea68c564" have entirely different histories.

4 changed files with 672 additions and 601 deletions

View File

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

View File

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

View File

@ -119,7 +119,7 @@ func (f *Formation) ResetRandSymbols(r *randx.Randx) {
symbol := reelDesc.Reel[symbolIdx%length] symbol := reelDesc.Reel[symbolIdx%length]
f.Symbols = append(f.Symbols, symbol) f.Symbols = append(f.Symbols, symbol)
} }
f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx-1+length)%length]) f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx-1)%length])
f.SymbolsBelow = append(f.SymbolsBelow, reelDesc.Reel[(startIdx+reelDesc.Range)%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] symbol := reelDesc.Reel[symbolIdx%length]
f.Symbols = append(f.Symbols, symbol) f.Symbols = append(f.Symbols, symbol)
} }
f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx-1+length)%length]) f.SymbolsAbove = append(f.SymbolsAbove, reelDesc.Reel[(startIdx-1)%length])
f.SymbolsBelow = append(f.SymbolsBelow, reelDesc.Reel[(startIdx+reelDesc.Range)%length]) f.SymbolsBelow = append(f.SymbolsBelow, reelDesc.Reel[(startIdx+reelDesc.Range)%length])
} }
} }