diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index 0d0b040..08fbfe8 100644 Binary files a/data/DB_GameItem.dat and b/data/DB_GameItem.dat differ diff --git a/data/DB_GameItem.json b/data/DB_GameItem.json index 9aa01b8..28ef954 100644 --- a/data/DB_GameItem.json +++ b/data/DB_GameItem.json @@ -19,7 +19,7 @@ 1 ], "Effect": [ - 0, + 1, 0, 1 ], @@ -49,7 +49,7 @@ 1 ], "Effect": [ - 0, + 1, 0, 1 ], @@ -79,7 +79,7 @@ 1 ], "Effect": [ - 0, + 1, 0, 1 ], @@ -109,7 +109,7 @@ 1 ], "Effect": [ - 0, + 1, 0, 1 ], @@ -139,7 +139,7 @@ 1 ], "Effect": [ - 0, + 1, 0, 1 ], diff --git a/data/DB_Game_Drop.dat b/data/DB_Game_Drop.dat index cb9b22d..fef8637 100644 --- a/data/DB_Game_Drop.dat +++ b/data/DB_Game_Drop.dat @@ -1,266 +1,254 @@ -(0: -'(0%: -N(0J: -u(0o: -(0: -(0: -(0: -(0: - (0: +(0: +'(0J: +N(0: +u(0: +(0: +(0: +(0: +(0: + (0:  -(0: - І(0: - ح(0: - (0: -(0: -(0: -(0: -(0: -(0: -(0: -(0: -(0: - (0: - (0 : -(0: -(0: -(0: -(0: -л(0: -(0: -!(0: -$(0": - '(0%: -!*(0(: -"-(0+: -#0(0.: -$3(01: -%6(04: -&9(07: -'=(0:: -(z(0N: - -)(0N: - -*(0N:2 -+Ó(0N:2K -, (0N:Kd -- (0N:d} -.(0N:} -/(0N: -0(0N: -1ʺ(0N: -2(0N: -3(0: -4'(0%: -5N(0J: -6u(0o: -7(0: -8(0: -9(0: -:(0: -;(0: -<(0: -=І(0: ->ح(0: -?(0: -@(0: -A(0: -B(0: -C(0: -D(0: -E(0: -F(0: -G(0: -H (0: -I (0 : -J(0: -K(0: -L(0: -M(0: -Nл(0: -O(0: -P!(0: -Q$(0": -R'(0%: -S*(0(: -T-(0+: -U0(0.: -V3(01: -W6(04: -X9(07: -Y=(0:: -Zz(0N: - -[(0N: - -\(0N:2 -]Ó(0N:2K -^ (0N:Kd -_ (0N:d} -`(0N:} -a(0N: -b(0N: -cʺ(0N: -d(0N: -e(0: -f'(0%: -gN(0J: -hu(0o: -i(0: -j(0: -k(0: -l(0: -m(0: -n(0: -oІ(0: -pح(0: -q(0: -r(0: -s(0: -t(0: -u(0: -v(0: -w(0: -x(0: -y(0: -z (0: -{ (0 : -|(0: -}(0: -~(0: -(0: -л(0: -(0: -!(0: -$(0": -'(0%: -*(0(: --(0+: -0(0.: -3(01: -6(04: -9(07: -=(0:: -z(0N: - -(0N: - -(0N:2 -Ó(0N:2K - (0N:Kd - (0N:d} -(0N:} -(0N: -(0N: -ʺ(0N: -(0N: -(0: -'(0%: -N(0J: -u(0o: -(0: -(0: -(0: -(0: -(0: -(0: -І(0: -ح(0: -(0: -(0: -(0: -(0: -(0: -(0: -(0: -(0: -(0: - (0: - (0 : -(0: -(0: -(0: -(0: -л(0: -(0: -!(0: -$(0": -'(0%: -*(0(: --(0+: -0(0.: -3(01: -6(04: -9(07: -=(0:: -z(0N: - -(0N: - -(0N:2 -Ó(0N:2K - (0N:Kd - (0N:d} -(0N:} -(0N: -(0N: -ʺ(0N: -(0N: -N(0J: -І(0: - (0 : -=(0:: -(0N: - - (0N:Kd -(0: -(0: -z(0N: - -(0N:2 -(0N: -_(0N: -N(0J: -І(0: - (0 : -=(0:: -(0N: - - (0N:Kd -N(0J: -І(0: - (0 : -=(0:: -(0N: - - (0N:Kd -N(0J: -І(0: - (0 : -=(0:: -(0N: - - (0N:Kd -N(0J: -І(0: - (0 : -=(0:: -(0N: - - (0N:Kd -N(0J: -І(0: - (0 : -=(0:: -(0N: - - (0N:Kd -N(0J: -І(0: - (0 : -=(0:: -(0N: - - (0N:Kd \ No newline at end of file +(0: + І(0: + ح(0: + (0: +(0: +(0: +(0: +(0 : +(0 : +(0 +: +(0 : +(0 : + (0: + (0: +(0: +(0": +(0(: +(0.: +л(04: +(0:: +!(0?: +$(0E: + '(0K: +!*(0N: +"-(0N: +#0(0N: +$3(0N: +%6(0N: +&9(0N: +'=(0N: +(z(0N: +)(0N: +*(0N:  ++Ó(0N: +, (0N: +- (0N:#' +.(0N:+/ +/(0N:26 +0(0N:9= +1ʺ(0N:AE +2(0N:HL +3(0: +4'(0J: +5N(0: +6u(0: +7(0: +8(0: +9(0: +:(0: +;(0: +<(0: +=І(0: +>ح(0: +?(0: +@(0: +A(0: +B(0: +C(0 : +D(0 : +E(0 +: +F(0 : +G(0 : +H (0: +I (0: +J(0: +K(0": +L(0(: +M(0.: +Nл(04: +O(0:: +P!(0?: +Q$(0E: +R'(0K: +S*(0N: +T-(0N: +U0(0N: +V3(0N: +W6(0N: +X9(0N: +Y=(0N: +Zz(0N: +[(0N: +\(0N:  +]Ó(0N: +^ (0N: +_ (0N:#' +`(0N:+/ +a(0N:26 +b(0N:9= +cʺ(0N:AE +d(0N:HL +e(0: +f'(0J: +gN(0: +hu(0: +i(0: +j(0: +k(0: +l(0: +m(0: +n(0: +oІ(0: +pح(0: +q(0: +r(0: +s(0: +t(0: +u(0 : +v(0 : +w(0 +: +x(0 : +y(0 : +z (0: +{ (0: +|(0: +}(0": +~(0(: +(0.: +л(04: +(0:: +!(0?: +$(0E: +'(0K: +*(0N: +-(0N: +0(0N: +3(0N: +6(0N: +9(0N: +=(0N: +z(0N: +(0N: +(0N:  +Ó(0N: + (0N: + (0N:#' +(0N:+/ +(0N:26 +(0N:9= +ʺ(0N:AE +(0N:HL +(0: +'(0J: +N(0: +u(0: +(0: +(0: +(0: +(0: +(0: +(0: +І(0: +ح(0: +(0: +(0: +(0: +(0: +(0 : +(0 : +(0 +: +(0 : +(0 : + (0: + (0: +(0: +(0": +(0(: +(0.: +л(04: +(0:: +!(0?: +$(0E: +'(0K: +*(0N: +-(0N: +0(0N: +3(0N: +6(0N: +9(0N: +=(0N: +z(0N: +(0N: +(0N:  +Ó(0N: + (0N: + (0N:#' +(0N:+/ +(0N:26 +(0N:9= +ʺ(0N:AE +(0N:HL +N(0: +І(0: + (0: +=(0N: +(0N: + (0N: +(0 : +(0:: +z(0N: +(0N:  +(0N:HL +_(0N: +N(0: +І(0: + (0: +=(0N: +(0N: + (0N: +N(0: +І(0: + (0: +=(0N: +(0N: + (0N: +N(0: +І(0: + (0: +=(0N: +(0N: + (0N: +N(0: +І(0: + (0: +=(0N: +(0N: + (0N: +N(0: +І(0: + (0: +=(0N: +(0N: + (0N: +N(0: +І(0: + (0: +=(0N: +(0N: + (0N: \ No newline at end of file diff --git a/data/DB_Game_Drop.json b/data/DB_Game_Drop.json index 2968cd8..acda596 100644 --- a/data/DB_Game_Drop.json +++ b/data/DB_Game_Drop.json @@ -5,7 +5,7 @@ "GameId": 207, "Bet": 2000, "ItemId1": 30001, - "Rate1": 15, + "Rate1": 30, "Amount1": [ 1, 1 @@ -16,7 +16,7 @@ "GameId": 207, "Bet": 5000, "ItemId1": 30001, - "Rate1": 37, + "Rate1": 74, "Amount1": [ 1, 1 @@ -27,7 +27,7 @@ "GameId": 207, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -38,7 +38,7 @@ "GameId": 207, "Bet": 15000, "ItemId1": 30001, - "Rate1": 111, + "Rate1": 223, "Amount1": [ 1, 1 @@ -49,7 +49,7 @@ "GameId": 207, "Bet": 20000, "ItemId1": 30001, - "Rate1": 149, + "Rate1": 297, "Amount1": [ 1, 1 @@ -60,7 +60,7 @@ "GameId": 207, "Bet": 25000, "ItemId1": 30001, - "Rate1": 186, + "Rate1": 371, "Amount1": [ 1, 1 @@ -71,7 +71,7 @@ "GameId": 207, "Bet": 30000, "ItemId1": 30001, - "Rate1": 223, + "Rate1": 446, "Amount1": [ 1, 1 @@ -82,7 +82,7 @@ "GameId": 207, "Bet": 35000, "ItemId1": 30001, - "Rate1": 260, + "Rate1": 520, "Amount1": [ 1, 1 @@ -93,7 +93,7 @@ "GameId": 207, "Bet": 40000, "ItemId1": 30001, - "Rate1": 297, + "Rate1": 594, "Amount1": [ 1, 1 @@ -104,7 +104,7 @@ "GameId": 207, "Bet": 45000, "ItemId1": 30001, - "Rate1": 334, + "Rate1": 668, "Amount1": [ 1, 1 @@ -115,7 +115,7 @@ "GameId": 207, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -126,7 +126,7 @@ "GameId": 207, "Bet": 55000, "ItemId1": 30001, - "Rate1": 408, + "Rate1": 817, "Amount1": [ 1, 1 @@ -137,7 +137,7 @@ "GameId": 207, "Bet": 60000, "ItemId1": 30001, - "Rate1": 446, + "Rate1": 891, "Amount1": [ 1, 1 @@ -148,7 +148,7 @@ "GameId": 207, "Bet": 65000, "ItemId1": 30001, - "Rate1": 483, + "Rate1": 965, "Amount1": [ 1, 1 @@ -159,7 +159,7 @@ "GameId": 207, "Bet": 70000, "ItemId1": 30001, - "Rate1": 520, + "Rate1": 1040, "Amount1": [ 1, 1 @@ -170,7 +170,7 @@ "GameId": 207, "Bet": 75000, "ItemId1": 30001, - "Rate1": 557, + "Rate1": 1114, "Amount1": [ 1, 1 @@ -181,7 +181,7 @@ "GameId": 207, "Bet": 80000, "ItemId1": 30001, - "Rate1": 594, + "Rate1": 1188, "Amount1": [ 1, 1 @@ -192,7 +192,7 @@ "GameId": 207, "Bet": 85000, "ItemId1": 30001, - "Rate1": 631, + "Rate1": 1262, "Amount1": [ 1, 1 @@ -203,7 +203,7 @@ "GameId": 207, "Bet": 90000, "ItemId1": 30001, - "Rate1": 668, + "Rate1": 1337, "Amount1": [ 1, 1 @@ -214,7 +214,7 @@ "GameId": 207, "Bet": 95000, "ItemId1": 30001, - "Rate1": 705, + "Rate1": 1411, "Amount1": [ 1, 1 @@ -225,7 +225,7 @@ "GameId": 207, "Bet": 100000, "ItemId1": 30001, - "Rate1": 743, + "Rate1": 1485, "Amount1": [ 1, 1 @@ -236,7 +236,7 @@ "GameId": 207, "Bet": 150000, "ItemId1": 30001, - "Rate1": 1114, + "Rate1": 2228, "Amount1": [ 1, 1 @@ -247,7 +247,7 @@ "GameId": 207, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -258,7 +258,7 @@ "GameId": 207, "Bet": 250000, "ItemId1": 30001, - "Rate1": 1856, + "Rate1": 3713, "Amount1": [ 1, 1 @@ -269,7 +269,7 @@ "GameId": 207, "Bet": 300000, "ItemId1": 30001, - "Rate1": 2228, + "Rate1": 4455, "Amount1": [ 1, 2 @@ -280,7 +280,7 @@ "GameId": 207, "Bet": 350000, "ItemId1": 30001, - "Rate1": 2599, + "Rate1": 5198, "Amount1": [ 1, 2 @@ -291,7 +291,7 @@ "GameId": 207, "Bet": 400000, "ItemId1": 30001, - "Rate1": 2970, + "Rate1": 5940, "Amount1": [ 1, 2 @@ -302,7 +302,7 @@ "GameId": 207, "Bet": 450000, "ItemId1": 30001, - "Rate1": 3341, + "Rate1": 6683, "Amount1": [ 1, 2 @@ -313,7 +313,7 @@ "GameId": 207, "Bet": 500000, "ItemId1": 30001, - "Rate1": 3713, + "Rate1": 7425, "Amount1": [ 2, 3 @@ -324,7 +324,7 @@ "GameId": 207, "Bet": 550000, "ItemId1": 30001, - "Rate1": 4084, + "Rate1": 8168, "Amount1": [ 2, 3 @@ -335,7 +335,7 @@ "GameId": 207, "Bet": 600000, "ItemId1": 30001, - "Rate1": 4455, + "Rate1": 8910, "Amount1": [ 2, 3 @@ -346,7 +346,7 @@ "GameId": 207, "Bet": 650000, "ItemId1": 30001, - "Rate1": 4826, + "Rate1": 9653, "Amount1": [ 2, 3 @@ -357,7 +357,7 @@ "GameId": 207, "Bet": 700000, "ItemId1": 30001, - "Rate1": 5198, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -368,7 +368,7 @@ "GameId": 207, "Bet": 750000, "ItemId1": 30001, - "Rate1": 5569, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -379,7 +379,7 @@ "GameId": 207, "Bet": 800000, "ItemId1": 30001, - "Rate1": 5940, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -390,7 +390,7 @@ "GameId": 207, "Bet": 850000, "ItemId1": 30001, - "Rate1": 6311, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -401,7 +401,7 @@ "GameId": 207, "Bet": 900000, "ItemId1": 30001, - "Rate1": 6683, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -412,7 +412,7 @@ "GameId": 207, "Bet": 950000, "ItemId1": 30001, - "Rate1": 7054, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -423,7 +423,7 @@ "GameId": 207, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -436,8 +436,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 5, - 10 + 1, + 5 ] }, { @@ -447,8 +447,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -458,8 +458,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 25, - 50 + 13, + 17 ] }, { @@ -469,8 +469,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 50, - 75 + 20, + 24 ] }, { @@ -480,8 +480,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -491,8 +491,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 100, - 125 + 35, + 39 ] }, { @@ -502,8 +502,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 125, - 150 + 43, + 47 ] }, { @@ -513,8 +513,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 150, - 175 + 50, + 54 ] }, { @@ -524,8 +524,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 175, - 200 + 57, + 61 ] }, { @@ -535,8 +535,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 200, - 225 + 65, + 69 ] }, { @@ -546,8 +546,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 225, - 250 + 72, + 76 ] }, { @@ -555,7 +555,7 @@ "GameId": 208, "Bet": 2000, "ItemId1": 30001, - "Rate1": 15, + "Rate1": 30, "Amount1": [ 1, 1 @@ -566,7 +566,7 @@ "GameId": 208, "Bet": 5000, "ItemId1": 30001, - "Rate1": 37, + "Rate1": 74, "Amount1": [ 1, 1 @@ -577,7 +577,7 @@ "GameId": 208, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -588,7 +588,7 @@ "GameId": 208, "Bet": 15000, "ItemId1": 30001, - "Rate1": 111, + "Rate1": 223, "Amount1": [ 1, 1 @@ -599,7 +599,7 @@ "GameId": 208, "Bet": 20000, "ItemId1": 30001, - "Rate1": 149, + "Rate1": 297, "Amount1": [ 1, 1 @@ -610,7 +610,7 @@ "GameId": 208, "Bet": 25000, "ItemId1": 30001, - "Rate1": 186, + "Rate1": 371, "Amount1": [ 1, 1 @@ -621,7 +621,7 @@ "GameId": 208, "Bet": 30000, "ItemId1": 30001, - "Rate1": 223, + "Rate1": 446, "Amount1": [ 1, 1 @@ -632,7 +632,7 @@ "GameId": 208, "Bet": 35000, "ItemId1": 30001, - "Rate1": 260, + "Rate1": 520, "Amount1": [ 1, 1 @@ -643,7 +643,7 @@ "GameId": 208, "Bet": 40000, "ItemId1": 30001, - "Rate1": 297, + "Rate1": 594, "Amount1": [ 1, 1 @@ -654,7 +654,7 @@ "GameId": 208, "Bet": 45000, "ItemId1": 30001, - "Rate1": 334, + "Rate1": 668, "Amount1": [ 1, 1 @@ -665,7 +665,7 @@ "GameId": 208, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -676,7 +676,7 @@ "GameId": 208, "Bet": 55000, "ItemId1": 30001, - "Rate1": 408, + "Rate1": 817, "Amount1": [ 1, 1 @@ -687,7 +687,7 @@ "GameId": 208, "Bet": 60000, "ItemId1": 30001, - "Rate1": 446, + "Rate1": 891, "Amount1": [ 1, 1 @@ -698,7 +698,7 @@ "GameId": 208, "Bet": 65000, "ItemId1": 30001, - "Rate1": 483, + "Rate1": 965, "Amount1": [ 1, 1 @@ -709,7 +709,7 @@ "GameId": 208, "Bet": 70000, "ItemId1": 30001, - "Rate1": 520, + "Rate1": 1040, "Amount1": [ 1, 1 @@ -720,7 +720,7 @@ "GameId": 208, "Bet": 75000, "ItemId1": 30001, - "Rate1": 557, + "Rate1": 1114, "Amount1": [ 1, 1 @@ -731,7 +731,7 @@ "GameId": 208, "Bet": 80000, "ItemId1": 30001, - "Rate1": 594, + "Rate1": 1188, "Amount1": [ 1, 1 @@ -742,7 +742,7 @@ "GameId": 208, "Bet": 85000, "ItemId1": 30001, - "Rate1": 631, + "Rate1": 1262, "Amount1": [ 1, 1 @@ -753,7 +753,7 @@ "GameId": 208, "Bet": 90000, "ItemId1": 30001, - "Rate1": 668, + "Rate1": 1337, "Amount1": [ 1, 1 @@ -764,7 +764,7 @@ "GameId": 208, "Bet": 95000, "ItemId1": 30001, - "Rate1": 705, + "Rate1": 1411, "Amount1": [ 1, 1 @@ -775,7 +775,7 @@ "GameId": 208, "Bet": 100000, "ItemId1": 30001, - "Rate1": 743, + "Rate1": 1485, "Amount1": [ 1, 1 @@ -786,7 +786,7 @@ "GameId": 208, "Bet": 150000, "ItemId1": 30001, - "Rate1": 1114, + "Rate1": 2228, "Amount1": [ 1, 1 @@ -797,7 +797,7 @@ "GameId": 208, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -808,7 +808,7 @@ "GameId": 208, "Bet": 250000, "ItemId1": 30001, - "Rate1": 1856, + "Rate1": 3713, "Amount1": [ 1, 1 @@ -819,7 +819,7 @@ "GameId": 208, "Bet": 300000, "ItemId1": 30001, - "Rate1": 2228, + "Rate1": 4455, "Amount1": [ 1, 2 @@ -830,7 +830,7 @@ "GameId": 208, "Bet": 350000, "ItemId1": 30001, - "Rate1": 2599, + "Rate1": 5198, "Amount1": [ 1, 2 @@ -841,7 +841,7 @@ "GameId": 208, "Bet": 400000, "ItemId1": 30001, - "Rate1": 2970, + "Rate1": 5940, "Amount1": [ 1, 2 @@ -852,7 +852,7 @@ "GameId": 208, "Bet": 450000, "ItemId1": 30001, - "Rate1": 3341, + "Rate1": 6683, "Amount1": [ 1, 2 @@ -863,7 +863,7 @@ "GameId": 208, "Bet": 500000, "ItemId1": 30001, - "Rate1": 3713, + "Rate1": 7425, "Amount1": [ 2, 3 @@ -874,7 +874,7 @@ "GameId": 208, "Bet": 550000, "ItemId1": 30001, - "Rate1": 4084, + "Rate1": 8168, "Amount1": [ 2, 3 @@ -885,7 +885,7 @@ "GameId": 208, "Bet": 600000, "ItemId1": 30001, - "Rate1": 4455, + "Rate1": 8910, "Amount1": [ 2, 3 @@ -896,7 +896,7 @@ "GameId": 208, "Bet": 650000, "ItemId1": 30001, - "Rate1": 4826, + "Rate1": 9653, "Amount1": [ 2, 3 @@ -907,7 +907,7 @@ "GameId": 208, "Bet": 700000, "ItemId1": 30001, - "Rate1": 5198, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -918,7 +918,7 @@ "GameId": 208, "Bet": 750000, "ItemId1": 30001, - "Rate1": 5569, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -929,7 +929,7 @@ "GameId": 208, "Bet": 800000, "ItemId1": 30001, - "Rate1": 5940, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -940,7 +940,7 @@ "GameId": 208, "Bet": 850000, "ItemId1": 30001, - "Rate1": 6311, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -951,7 +951,7 @@ "GameId": 208, "Bet": 900000, "ItemId1": 30001, - "Rate1": 6683, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -962,7 +962,7 @@ "GameId": 208, "Bet": 950000, "ItemId1": 30001, - "Rate1": 7054, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -973,7 +973,7 @@ "GameId": 208, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -986,8 +986,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 5, - 10 + 1, + 5 ] }, { @@ -997,8 +997,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -1008,8 +1008,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 25, - 50 + 13, + 17 ] }, { @@ -1019,8 +1019,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 50, - 75 + 20, + 24 ] }, { @@ -1030,8 +1030,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -1041,8 +1041,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 100, - 125 + 35, + 39 ] }, { @@ -1052,8 +1052,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 125, - 150 + 43, + 47 ] }, { @@ -1063,8 +1063,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 150, - 175 + 50, + 54 ] }, { @@ -1074,8 +1074,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 175, - 200 + 57, + 61 ] }, { @@ -1085,8 +1085,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 200, - 225 + 65, + 69 ] }, { @@ -1096,8 +1096,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 225, - 250 + 72, + 76 ] }, { @@ -1105,7 +1105,7 @@ "GameId": 209, "Bet": 2000, "ItemId1": 30001, - "Rate1": 15, + "Rate1": 30, "Amount1": [ 1, 1 @@ -1116,7 +1116,7 @@ "GameId": 209, "Bet": 5000, "ItemId1": 30001, - "Rate1": 37, + "Rate1": 74, "Amount1": [ 1, 1 @@ -1127,7 +1127,7 @@ "GameId": 209, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -1138,7 +1138,7 @@ "GameId": 209, "Bet": 15000, "ItemId1": 30001, - "Rate1": 111, + "Rate1": 223, "Amount1": [ 1, 1 @@ -1149,7 +1149,7 @@ "GameId": 209, "Bet": 20000, "ItemId1": 30001, - "Rate1": 149, + "Rate1": 297, "Amount1": [ 1, 1 @@ -1160,7 +1160,7 @@ "GameId": 209, "Bet": 25000, "ItemId1": 30001, - "Rate1": 186, + "Rate1": 371, "Amount1": [ 1, 1 @@ -1171,7 +1171,7 @@ "GameId": 209, "Bet": 30000, "ItemId1": 30001, - "Rate1": 223, + "Rate1": 446, "Amount1": [ 1, 1 @@ -1182,7 +1182,7 @@ "GameId": 209, "Bet": 35000, "ItemId1": 30001, - "Rate1": 260, + "Rate1": 520, "Amount1": [ 1, 1 @@ -1193,7 +1193,7 @@ "GameId": 209, "Bet": 40000, "ItemId1": 30001, - "Rate1": 297, + "Rate1": 594, "Amount1": [ 1, 1 @@ -1204,7 +1204,7 @@ "GameId": 209, "Bet": 45000, "ItemId1": 30001, - "Rate1": 334, + "Rate1": 668, "Amount1": [ 1, 1 @@ -1215,7 +1215,7 @@ "GameId": 209, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -1226,7 +1226,7 @@ "GameId": 209, "Bet": 55000, "ItemId1": 30001, - "Rate1": 408, + "Rate1": 817, "Amount1": [ 1, 1 @@ -1237,7 +1237,7 @@ "GameId": 209, "Bet": 60000, "ItemId1": 30001, - "Rate1": 446, + "Rate1": 891, "Amount1": [ 1, 1 @@ -1248,7 +1248,7 @@ "GameId": 209, "Bet": 65000, "ItemId1": 30001, - "Rate1": 483, + "Rate1": 965, "Amount1": [ 1, 1 @@ -1259,7 +1259,7 @@ "GameId": 209, "Bet": 70000, "ItemId1": 30001, - "Rate1": 520, + "Rate1": 1040, "Amount1": [ 1, 1 @@ -1270,7 +1270,7 @@ "GameId": 209, "Bet": 75000, "ItemId1": 30001, - "Rate1": 557, + "Rate1": 1114, "Amount1": [ 1, 1 @@ -1281,7 +1281,7 @@ "GameId": 209, "Bet": 80000, "ItemId1": 30001, - "Rate1": 594, + "Rate1": 1188, "Amount1": [ 1, 1 @@ -1292,7 +1292,7 @@ "GameId": 209, "Bet": 85000, "ItemId1": 30001, - "Rate1": 631, + "Rate1": 1262, "Amount1": [ 1, 1 @@ -1303,7 +1303,7 @@ "GameId": 209, "Bet": 90000, "ItemId1": 30001, - "Rate1": 668, + "Rate1": 1337, "Amount1": [ 1, 1 @@ -1314,7 +1314,7 @@ "GameId": 209, "Bet": 95000, "ItemId1": 30001, - "Rate1": 705, + "Rate1": 1411, "Amount1": [ 1, 1 @@ -1325,7 +1325,7 @@ "GameId": 209, "Bet": 100000, "ItemId1": 30001, - "Rate1": 743, + "Rate1": 1485, "Amount1": [ 1, 1 @@ -1336,7 +1336,7 @@ "GameId": 209, "Bet": 150000, "ItemId1": 30001, - "Rate1": 1114, + "Rate1": 2228, "Amount1": [ 1, 1 @@ -1347,7 +1347,7 @@ "GameId": 209, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -1358,7 +1358,7 @@ "GameId": 209, "Bet": 250000, "ItemId1": 30001, - "Rate1": 1856, + "Rate1": 3713, "Amount1": [ 1, 1 @@ -1369,7 +1369,7 @@ "GameId": 209, "Bet": 300000, "ItemId1": 30001, - "Rate1": 2228, + "Rate1": 4455, "Amount1": [ 1, 2 @@ -1380,7 +1380,7 @@ "GameId": 209, "Bet": 350000, "ItemId1": 30001, - "Rate1": 2599, + "Rate1": 5198, "Amount1": [ 1, 2 @@ -1391,7 +1391,7 @@ "GameId": 209, "Bet": 400000, "ItemId1": 30001, - "Rate1": 2970, + "Rate1": 5940, "Amount1": [ 1, 2 @@ -1402,7 +1402,7 @@ "GameId": 209, "Bet": 450000, "ItemId1": 30001, - "Rate1": 3341, + "Rate1": 6683, "Amount1": [ 1, 2 @@ -1413,7 +1413,7 @@ "GameId": 209, "Bet": 500000, "ItemId1": 30001, - "Rate1": 3713, + "Rate1": 7425, "Amount1": [ 2, 3 @@ -1424,7 +1424,7 @@ "GameId": 209, "Bet": 550000, "ItemId1": 30001, - "Rate1": 4084, + "Rate1": 8168, "Amount1": [ 2, 3 @@ -1435,7 +1435,7 @@ "GameId": 209, "Bet": 600000, "ItemId1": 30001, - "Rate1": 4455, + "Rate1": 8910, "Amount1": [ 2, 3 @@ -1446,7 +1446,7 @@ "GameId": 209, "Bet": 650000, "ItemId1": 30001, - "Rate1": 4826, + "Rate1": 9653, "Amount1": [ 2, 3 @@ -1457,7 +1457,7 @@ "GameId": 209, "Bet": 700000, "ItemId1": 30001, - "Rate1": 5198, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -1468,7 +1468,7 @@ "GameId": 209, "Bet": 750000, "ItemId1": 30001, - "Rate1": 5569, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -1479,7 +1479,7 @@ "GameId": 209, "Bet": 800000, "ItemId1": 30001, - "Rate1": 5940, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -1490,7 +1490,7 @@ "GameId": 209, "Bet": 850000, "ItemId1": 30001, - "Rate1": 6311, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -1501,7 +1501,7 @@ "GameId": 209, "Bet": 900000, "ItemId1": 30001, - "Rate1": 6683, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -1512,7 +1512,7 @@ "GameId": 209, "Bet": 950000, "ItemId1": 30001, - "Rate1": 7054, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -1523,7 +1523,7 @@ "GameId": 209, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -1536,8 +1536,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 5, - 10 + 1, + 5 ] }, { @@ -1547,8 +1547,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -1558,8 +1558,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 25, - 50 + 13, + 17 ] }, { @@ -1569,8 +1569,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 50, - 75 + 20, + 24 ] }, { @@ -1580,8 +1580,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -1591,8 +1591,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 100, - 125 + 35, + 39 ] }, { @@ -1602,8 +1602,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 125, - 150 + 43, + 47 ] }, { @@ -1613,8 +1613,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 150, - 175 + 50, + 54 ] }, { @@ -1624,8 +1624,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 175, - 200 + 57, + 61 ] }, { @@ -1635,8 +1635,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 200, - 225 + 65, + 69 ] }, { @@ -1646,8 +1646,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 225, - 250 + 72, + 76 ] }, { @@ -1655,7 +1655,7 @@ "GameId": 210, "Bet": 2000, "ItemId1": 30001, - "Rate1": 15, + "Rate1": 30, "Amount1": [ 1, 1 @@ -1666,7 +1666,7 @@ "GameId": 210, "Bet": 5000, "ItemId1": 30001, - "Rate1": 37, + "Rate1": 74, "Amount1": [ 1, 1 @@ -1677,7 +1677,7 @@ "GameId": 210, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -1688,7 +1688,7 @@ "GameId": 210, "Bet": 15000, "ItemId1": 30001, - "Rate1": 111, + "Rate1": 223, "Amount1": [ 1, 1 @@ -1699,7 +1699,7 @@ "GameId": 210, "Bet": 20000, "ItemId1": 30001, - "Rate1": 149, + "Rate1": 297, "Amount1": [ 1, 1 @@ -1710,7 +1710,7 @@ "GameId": 210, "Bet": 25000, "ItemId1": 30001, - "Rate1": 186, + "Rate1": 371, "Amount1": [ 1, 1 @@ -1721,7 +1721,7 @@ "GameId": 210, "Bet": 30000, "ItemId1": 30001, - "Rate1": 223, + "Rate1": 446, "Amount1": [ 1, 1 @@ -1732,7 +1732,7 @@ "GameId": 210, "Bet": 35000, "ItemId1": 30001, - "Rate1": 260, + "Rate1": 520, "Amount1": [ 1, 1 @@ -1743,7 +1743,7 @@ "GameId": 210, "Bet": 40000, "ItemId1": 30001, - "Rate1": 297, + "Rate1": 594, "Amount1": [ 1, 1 @@ -1754,7 +1754,7 @@ "GameId": 210, "Bet": 45000, "ItemId1": 30001, - "Rate1": 334, + "Rate1": 668, "Amount1": [ 1, 1 @@ -1765,7 +1765,7 @@ "GameId": 210, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -1776,7 +1776,7 @@ "GameId": 210, "Bet": 55000, "ItemId1": 30001, - "Rate1": 408, + "Rate1": 817, "Amount1": [ 1, 1 @@ -1787,7 +1787,7 @@ "GameId": 210, "Bet": 60000, "ItemId1": 30001, - "Rate1": 446, + "Rate1": 891, "Amount1": [ 1, 1 @@ -1798,7 +1798,7 @@ "GameId": 210, "Bet": 65000, "ItemId1": 30001, - "Rate1": 483, + "Rate1": 965, "Amount1": [ 1, 1 @@ -1809,7 +1809,7 @@ "GameId": 210, "Bet": 70000, "ItemId1": 30001, - "Rate1": 520, + "Rate1": 1040, "Amount1": [ 1, 1 @@ -1820,7 +1820,7 @@ "GameId": 210, "Bet": 75000, "ItemId1": 30001, - "Rate1": 557, + "Rate1": 1114, "Amount1": [ 1, 1 @@ -1831,7 +1831,7 @@ "GameId": 210, "Bet": 80000, "ItemId1": 30001, - "Rate1": 594, + "Rate1": 1188, "Amount1": [ 1, 1 @@ -1842,7 +1842,7 @@ "GameId": 210, "Bet": 85000, "ItemId1": 30001, - "Rate1": 631, + "Rate1": 1262, "Amount1": [ 1, 1 @@ -1853,7 +1853,7 @@ "GameId": 210, "Bet": 90000, "ItemId1": 30001, - "Rate1": 668, + "Rate1": 1337, "Amount1": [ 1, 1 @@ -1864,7 +1864,7 @@ "GameId": 210, "Bet": 95000, "ItemId1": 30001, - "Rate1": 705, + "Rate1": 1411, "Amount1": [ 1, 1 @@ -1875,7 +1875,7 @@ "GameId": 210, "Bet": 100000, "ItemId1": 30001, - "Rate1": 743, + "Rate1": 1485, "Amount1": [ 1, 1 @@ -1886,7 +1886,7 @@ "GameId": 210, "Bet": 150000, "ItemId1": 30001, - "Rate1": 1114, + "Rate1": 2228, "Amount1": [ 1, 1 @@ -1897,7 +1897,7 @@ "GameId": 210, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -1908,7 +1908,7 @@ "GameId": 210, "Bet": 250000, "ItemId1": 30001, - "Rate1": 1856, + "Rate1": 3713, "Amount1": [ 1, 1 @@ -1919,7 +1919,7 @@ "GameId": 210, "Bet": 300000, "ItemId1": 30001, - "Rate1": 2228, + "Rate1": 4455, "Amount1": [ 1, 2 @@ -1930,7 +1930,7 @@ "GameId": 210, "Bet": 350000, "ItemId1": 30001, - "Rate1": 2599, + "Rate1": 5198, "Amount1": [ 1, 2 @@ -1941,7 +1941,7 @@ "GameId": 210, "Bet": 400000, "ItemId1": 30001, - "Rate1": 2970, + "Rate1": 5940, "Amount1": [ 1, 2 @@ -1952,7 +1952,7 @@ "GameId": 210, "Bet": 450000, "ItemId1": 30001, - "Rate1": 3341, + "Rate1": 6683, "Amount1": [ 1, 2 @@ -1963,7 +1963,7 @@ "GameId": 210, "Bet": 500000, "ItemId1": 30001, - "Rate1": 3713, + "Rate1": 7425, "Amount1": [ 2, 3 @@ -1974,7 +1974,7 @@ "GameId": 210, "Bet": 550000, "ItemId1": 30001, - "Rate1": 4084, + "Rate1": 8168, "Amount1": [ 2, 3 @@ -1985,7 +1985,7 @@ "GameId": 210, "Bet": 600000, "ItemId1": 30001, - "Rate1": 4455, + "Rate1": 8910, "Amount1": [ 2, 3 @@ -1996,7 +1996,7 @@ "GameId": 210, "Bet": 650000, "ItemId1": 30001, - "Rate1": 4826, + "Rate1": 9653, "Amount1": [ 2, 3 @@ -2007,7 +2007,7 @@ "GameId": 210, "Bet": 700000, "ItemId1": 30001, - "Rate1": 5198, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -2018,7 +2018,7 @@ "GameId": 210, "Bet": 750000, "ItemId1": 30001, - "Rate1": 5569, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -2029,7 +2029,7 @@ "GameId": 210, "Bet": 800000, "ItemId1": 30001, - "Rate1": 5940, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -2040,7 +2040,7 @@ "GameId": 210, "Bet": 850000, "ItemId1": 30001, - "Rate1": 6311, + "Rate1": 10000, "Amount1": [ 2, 4 @@ -2051,7 +2051,7 @@ "GameId": 210, "Bet": 900000, "ItemId1": 30001, - "Rate1": 6683, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2062,7 +2062,7 @@ "GameId": 210, "Bet": 950000, "ItemId1": 30001, - "Rate1": 7054, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2073,7 +2073,7 @@ "GameId": 210, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2086,8 +2086,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 5, - 10 + 1, + 5 ] }, { @@ -2097,8 +2097,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -2108,8 +2108,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 25, - 50 + 13, + 17 ] }, { @@ -2119,8 +2119,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 50, - 75 + 20, + 24 ] }, { @@ -2130,8 +2130,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -2141,8 +2141,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 100, - 125 + 35, + 39 ] }, { @@ -2152,8 +2152,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 125, - 150 + 43, + 47 ] }, { @@ -2163,8 +2163,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 150, - 175 + 50, + 54 ] }, { @@ -2174,8 +2174,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 175, - 200 + 57, + 61 ] }, { @@ -2185,8 +2185,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 200, - 225 + 65, + 69 ] }, { @@ -2196,8 +2196,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 225, - 250 + 72, + 76 ] }, { @@ -2205,7 +2205,7 @@ "GameId": 240, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -2216,7 +2216,7 @@ "GameId": 240, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -2227,7 +2227,7 @@ "GameId": 240, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -2238,7 +2238,7 @@ "GameId": 240, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2251,8 +2251,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -2262,8 +2262,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -2271,7 +2271,7 @@ "GameId": 244, "Bet": 100000, "ItemId1": 30001, - "Rate1": 743, + "Rate1": 1485, "Amount1": [ 1, 1 @@ -2282,7 +2282,7 @@ "GameId": 244, "Bet": 500000, "ItemId1": 30001, - "Rate1": 3713, + "Rate1": 7425, "Amount1": [ 2, 3 @@ -2295,8 +2295,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 5, - 10 + 1, + 5 ] }, { @@ -2306,8 +2306,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 25, - 50 + 13, + 17 ] }, { @@ -2317,8 +2317,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 225, - 250 + 72, + 76 ] }, { @@ -2328,8 +2328,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 300, - 500 + 295, + 299 ] }, { @@ -2337,7 +2337,7 @@ "GameId": 241, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -2348,7 +2348,7 @@ "GameId": 241, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -2359,7 +2359,7 @@ "GameId": 241, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -2370,7 +2370,7 @@ "GameId": 241, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2383,8 +2383,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -2394,8 +2394,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -2403,7 +2403,7 @@ "GameId": 245, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -2414,7 +2414,7 @@ "GameId": 245, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -2425,7 +2425,7 @@ "GameId": 245, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -2436,7 +2436,7 @@ "GameId": 245, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2449,8 +2449,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -2460,8 +2460,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -2469,7 +2469,7 @@ "GameId": 242, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -2480,7 +2480,7 @@ "GameId": 242, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -2491,7 +2491,7 @@ "GameId": 242, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -2502,7 +2502,7 @@ "GameId": 242, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2515,8 +2515,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -2526,8 +2526,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -2535,7 +2535,7 @@ "GameId": 246, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -2546,7 +2546,7 @@ "GameId": 246, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -2557,7 +2557,7 @@ "GameId": 246, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -2568,7 +2568,7 @@ "GameId": 246, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2581,8 +2581,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -2592,8 +2592,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -2601,7 +2601,7 @@ "GameId": 243, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -2612,7 +2612,7 @@ "GameId": 243, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -2623,7 +2623,7 @@ "GameId": 243, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -2634,7 +2634,7 @@ "GameId": 243, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2647,8 +2647,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -2658,8 +2658,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] }, { @@ -2667,7 +2667,7 @@ "GameId": 247, "Bet": 10000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 149, "Amount1": [ 1, 1 @@ -2678,7 +2678,7 @@ "GameId": 247, "Bet": 50000, "ItemId1": 30001, - "Rate1": 371, + "Rate1": 743, "Amount1": [ 1, 1 @@ -2689,7 +2689,7 @@ "GameId": 247, "Bet": 200000, "ItemId1": 30001, - "Rate1": 1485, + "Rate1": 2970, "Amount1": [ 1, 1 @@ -2700,7 +2700,7 @@ "GameId": 247, "Bet": 1000000, "ItemId1": 30001, - "Rate1": 7425, + "Rate1": 10000, "Amount1": [ 3, 5 @@ -2713,8 +2713,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 10, - 25 + 5, + 9 ] }, { @@ -2724,8 +2724,8 @@ "ItemId1": 30001, "Rate1": 10000, "Amount1": [ - 75, - 100 + 28, + 32 ] } ] diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index b7451ac..d7e877d 100644 --- a/data/DB_PropExchange.dat +++ b/data/DB_PropExchange.dat @@ -1,5 +1,5 @@ -6ӆԆՆֆ׆"= +6ֆ׆ӆԆՆ"= .؆نچۆ"= -WنچۆӆԆֆ؆Ն׆"  -]ֆ׆؆چۆ܆ӆԆՆن" \ No newline at end of file +WنچۆӆՆ׆؆Ԇֆ"  +]Նֆۆنچ܆ӆԆ׆؆" \ No newline at end of file diff --git a/data/DB_Task.dat b/data/DB_Task.dat index bb6d597..9046ecb 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/data/DB_Task.json b/data/DB_Task.json index 038ecda..2179a0d 100644 --- a/data/DB_Task.json +++ b/data/DB_Task.json @@ -199,6 +199,18 @@ "100002": 10 } }, + { + "Id": 21, + "Order": 6, + "ActivityType": 3, + "TaskType": 18, + "TargetTimes": 100, + "FinishTimes": 1, + "Award": { + "100001": 10000000, + "100002": 10 + } + }, { "Id": 17, "Order": 1, diff --git a/protocol/gamehall/game.pb.go b/protocol/gamehall/game.pb.go index a15294c..0a97e7f 100644 --- a/protocol/gamehall/game.pb.go +++ b/protocol/gamehall/game.pb.go @@ -284,6 +284,8 @@ const ( GameHallPacketID_PACKET_CS_PLAYER_SWITCHFLAG GameHallPacketID = 8008 GameHallPacketID_PACKET_CSRoomEvent GameHallPacketID = 8009 // 房间事件 GameHallPacketID_PACKET_SCRoomEvent GameHallPacketID = 8010 // 房间事件 + GameHallPacketID_PACKET_CSExchangeChannel GameHallPacketID = 8011 // 开启兑换的渠道 + GameHallPacketID_PACKET_SCExchangeChannel GameHallPacketID = 8012 // 开启兑换的渠道 ) // Enum value maps for GameHallPacketID. @@ -390,6 +392,8 @@ var ( 8008: "PACKET_CS_PLAYER_SWITCHFLAG", 8009: "PACKET_CSRoomEvent", 8010: "PACKET_SCRoomEvent", + 8011: "PACKET_CSExchangeChannel", + 8012: "PACKET_SCExchangeChannel", } GameHallPacketID_value = map[string]int32{ "PACKET_GameHall_ZERO": 0, @@ -493,6 +497,8 @@ var ( "PACKET_CS_PLAYER_SWITCHFLAG": 8008, "PACKET_CSRoomEvent": 8009, "PACKET_SCRoomEvent": 8010, + "PACKET_CSExchangeChannel": 8011, + "PACKET_SCExchangeChannel": 8012, } ) @@ -7182,6 +7188,93 @@ func (x *SCRoomEvent) GetTs() int64 { return 0 } +// PACKET_CSExchangeChannel +type CSExchangeChannel struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *CSExchangeChannel) Reset() { + *x = CSExchangeChannel{} + if protoimpl.UnsafeEnabled { + mi := &file_game_proto_msgTypes[102] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CSExchangeChannel) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CSExchangeChannel) ProtoMessage() {} + +func (x *CSExchangeChannel) ProtoReflect() protoreflect.Message { + mi := &file_game_proto_msgTypes[102] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CSExchangeChannel.ProtoReflect.Descriptor instead. +func (*CSExchangeChannel) Descriptor() ([]byte, []int) { + return file_game_proto_rawDescGZIP(), []int{102} +} + +// PACKET_SCExchangeChannel +type SCExchangeChannel struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + OnChannelName []string `protobuf:"bytes,1,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道 +} + +func (x *SCExchangeChannel) Reset() { + *x = SCExchangeChannel{} + if protoimpl.UnsafeEnabled { + mi := &file_game_proto_msgTypes[103] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SCExchangeChannel) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SCExchangeChannel) ProtoMessage() {} + +func (x *SCExchangeChannel) ProtoReflect() protoreflect.Message { + mi := &file_game_proto_msgTypes[103] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SCExchangeChannel.ProtoReflect.Descriptor instead. +func (*SCExchangeChannel) Descriptor() ([]byte, []int) { + return file_game_proto_rawDescGZIP(), []int{103} +} + +func (x *SCExchangeChannel) GetOnChannelName() []string { + if x != nil { + return x.OnChannelName + } + return nil +} + var File_game_proto protoreflect.FileDescriptor var file_game_proto_rawDesc = []byte{ @@ -7913,7 +8006,12 @@ var file_game_proto_rawDesc = []byte{ 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x0e, 0x0a, 0x02, - 0x54, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x2a, 0xe6, 0x09, 0x0a, + 0x54, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x22, 0x13, 0x0a, 0x11, + 0x43, 0x53, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, + 0x6c, 0x22, 0x39, 0x0a, 0x11, 0x53, 0x43, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, + 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, + 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x4f, + 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x2a, 0xe6, 0x09, 0x0a, 0x11, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4f, 0x50, 0x52, 0x43, @@ -7992,7 +8090,7 @@ var file_game_proto_rawDesc = []byte{ 0x5f, 0x51, 0x75, 0x6f, 0x74, 0x61, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x10, 0xab, 0x46, 0x12, 0x1c, 0x0a, 0x17, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x54, 0x68, 0x72, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x47, 0x61, - 0x6d, 0x65, 0x10, 0xb2, 0x46, 0x2a, 0xd0, 0x17, 0x0a, 0x10, 0x47, 0x61, 0x6d, 0x65, 0x48, 0x61, + 0x6d, 0x65, 0x10, 0xb2, 0x46, 0x2a, 0x8e, 0x18, 0x0a, 0x10, 0x47, 0x61, 0x6d, 0x65, 0x48, 0x61, 0x6c, 0x6c, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x48, 0x61, 0x6c, 0x6c, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, @@ -8181,10 +8279,14 @@ var file_game_proto_rawDesc = []byte{ 0x4c, 0x41, 0x47, 0x10, 0xc8, 0x3e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x52, 0x6f, 0x6f, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x10, 0xc9, 0x3e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x6f, 0x6f, 0x6d, - 0x45, 0x76, 0x65, 0x6e, 0x74, 0x10, 0xca, 0x3e, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67, - 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, - 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x68, 0x61, - 0x6c, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x10, 0xca, 0x3e, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, + 0x45, 0x54, 0x5f, 0x43, 0x53, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, + 0x6e, 0x6e, 0x65, 0x6c, 0x10, 0xcb, 0x3e, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, + 0x54, 0x5f, 0x53, 0x43, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, + 0x6e, 0x65, 0x6c, 0x10, 0xcc, 0x3e, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, + 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x68, 0x61, 0x6c, 0x6c, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -8200,7 +8302,7 @@ func file_game_proto_rawDescGZIP() []byte { } var file_game_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 102) +var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 104) var file_game_proto_goTypes = []interface{}{ (OpResultCode_Game)(0), // 0: gamehall.OpResultCode_Game (GameHallPacketID)(0), // 1: gamehall.GameHallPacketID @@ -8306,6 +8408,8 @@ var file_game_proto_goTypes = []interface{}{ (*SCNoticeChange)(nil), // 101: gamehall.SCNoticeChange (*CSRoomEvent)(nil), // 102: gamehall.CSRoomEvent (*SCRoomEvent)(nil), // 103: gamehall.SCRoomEvent + (*CSExchangeChannel)(nil), // 104: gamehall.CSExchangeChannel + (*SCExchangeChannel)(nil), // 105: gamehall.SCExchangeChannel } var file_game_proto_depIdxs = []int32{ 0, // 0: gamehall.SCEnterHall.OpRetCode:type_name -> gamehall.OpResultCode_Game @@ -9594,6 +9698,30 @@ func file_game_proto_init() { return nil } } + file_game_proto_msgTypes[102].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CSExchangeChannel); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_game_proto_msgTypes[103].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SCExchangeChannel); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -9601,7 +9729,7 @@ func file_game_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_game_proto_rawDesc, NumEnums: 2, - NumMessages: 102, + NumMessages: 104, NumExtensions: 0, NumServices: 0, }, diff --git a/protocol/gamehall/game.proto b/protocol/gamehall/game.proto index 12137c9..c6f81c3 100644 --- a/protocol/gamehall/game.proto +++ b/protocol/gamehall/game.proto @@ -159,6 +159,8 @@ enum GameHallPacketID { PACKET_CS_PLAYER_SWITCHFLAG = 8008; PACKET_CSRoomEvent = 8009; // 房间事件 PACKET_SCRoomEvent = 8010; // 房间事件 + PACKET_CSExchangeChannel = 8011; // 开启兑换的渠道 + PACKET_SCExchangeChannel = 8012; // 开启兑换的渠道 } //进入游戏大厅 //PACKET_CS_ENTERHALL @@ -860,4 +862,12 @@ message SCRoomEvent{ string Content = 4; // 内容 repeated int32 Param= 5; // 参数 int64 Ts = 6; // 时间戳 +} + +// PACKET_CSExchangeChannel +message CSExchangeChannel{} + +// PACKET_SCExchangeChannel +message SCExchangeChannel{ + repeated string OnChannelName = 1; // 开启渠道 } \ No newline at end of file diff --git a/protocol/webapi/common.pb.go b/protocol/webapi/common.pb.go index 085d71f..1edfdf3 100644 --- a/protocol/webapi/common.pb.go +++ b/protocol/webapi/common.pb.go @@ -5701,6 +5701,62 @@ func (x *WelfareCollectConfig) GetSwitch() int32 { return 0 } +// etcd /game/exchange/channel +type ExchangeChannelConfig struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` + OnChannelName []string `protobuf:"bytes,2,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道 +} + +func (x *ExchangeChannelConfig) Reset() { + *x = ExchangeChannelConfig{} + if protoimpl.UnsafeEnabled { + mi := &file_common_proto_msgTypes[55] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ExchangeChannelConfig) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ExchangeChannelConfig) ProtoMessage() {} + +func (x *ExchangeChannelConfig) ProtoReflect() protoreflect.Message { + mi := &file_common_proto_msgTypes[55] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ExchangeChannelConfig.ProtoReflect.Descriptor instead. +func (*ExchangeChannelConfig) Descriptor() ([]byte, []int) { + return file_common_proto_rawDescGZIP(), []int{55} +} + +func (x *ExchangeChannelConfig) GetPlatform() string { + if x != nil { + return x.Platform + } + return "" +} + +func (x *ExchangeChannelConfig) GetOnChannelName() []string { + if x != nil { + return x.OnChannelName + } + return nil +} + var File_common_proto protoreflect.FileDescriptor var file_common_proto_rawDesc = []byte{ @@ -6628,10 +6684,16 @@ var file_common_proto_rawDesc = []byte{ 0x63, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x42, 0x26, 0x5a, 0x24, - 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, - 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x59, 0x0a, 0x15, + 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x43, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, + 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, + 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, + 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, + 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -6646,7 +6708,7 @@ func file_common_proto_rawDescGZIP() []byte { return file_common_proto_rawDescData } -var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 60) +var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 61) var file_common_proto_goTypes = []interface{}{ (*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting (*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting @@ -6703,31 +6765,32 @@ var file_common_proto_goTypes = []interface{}{ (*GameConfig)(nil), // 52: webapi.GameConfig (*WelfarePhoneLotteryStatus)(nil), // 53: webapi.WelfarePhoneLotteryStatus (*WelfareCollectConfig)(nil), // 54: webapi.WelfareCollectConfig - nil, // 55: webapi.Platform.BindTelRewardEntry - nil, // 56: webapi.PlayerData.RankScoreEntry - nil, // 57: webapi.ItemShop.AwardEntry - nil, // 58: webapi.VIPcfg.AwardEntry - nil, // 59: webapi.VIPcfg.Privilege7Entry - (*server.DB_GameFree)(nil), // 60: server.DB_GameFree + (*ExchangeChannelConfig)(nil), // 55: webapi.ExchangeChannelConfig + nil, // 56: webapi.Platform.BindTelRewardEntry + nil, // 57: webapi.PlayerData.RankScoreEntry + nil, // 58: webapi.ItemShop.AwardEntry + nil, // 59: webapi.VIPcfg.AwardEntry + nil, // 60: webapi.VIPcfg.Privilege7Entry + (*server.DB_GameFree)(nil), // 61: server.DB_GameFree } var file_common_proto_depIdxs = []int32{ 2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch 3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig 4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame - 55, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry + 56, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry 6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus - 60, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree + 61, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree 8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree 0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting 1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting 1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting - 60, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree - 56, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry + 61, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree + 57, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry 20, // 12: webapi.OnlineReport.GameCount:type_name -> webapi.OnlineGameCnt 22, // 13: webapi.CommonNoticeList.List:type_name -> webapi.CommonNotice 25, // 14: webapi.ExchangeShop.ExType:type_name -> webapi.ExchangeType 24, // 15: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop - 57, // 16: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry + 58, // 16: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry 27, // 17: webapi.ItemShopList.List:type_name -> webapi.ItemShop 29, // 18: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo 30, // 19: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward @@ -6744,8 +6807,8 @@ var file_common_proto_depIdxs = []int32{ 33, // 30: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate 42, // 31: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree 42, // 32: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree - 58, // 33: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry - 59, // 34: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry + 59, // 33: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry + 60, // 34: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry 45, // 35: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg 33, // 36: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate 49, // 37: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig @@ -7422,6 +7485,18 @@ func file_common_proto_init() { return nil } } + file_common_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ExchangeChannelConfig); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -7429,7 +7504,7 @@ func file_common_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_common_proto_rawDesc, NumEnums: 0, - NumMessages: 60, + NumMessages: 61, NumExtensions: 0, NumServices: 0, }, diff --git a/protocol/webapi/common.proto b/protocol/webapi/common.proto index d35d787..236347c 100644 --- a/protocol/webapi/common.proto +++ b/protocol/webapi/common.proto @@ -631,4 +631,10 @@ message WelfarePhoneLotteryStatus{ message WelfareCollectConfig{ string Platform = 1; int32 Switch = 2; // 1.开启 2.关闭 +} + +// etcd /game/exchange/channel +message ExchangeChannelConfig{ + string Platform = 1; + repeated string OnChannelName = 2; // 开启渠道 } \ No newline at end of file diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index 261d937..30e4fad 100644 Binary files a/xlsx/DB_GameItem.xlsx and b/xlsx/DB_GameItem.xlsx differ diff --git a/xlsx/DB_Game_Drop.xlsx b/xlsx/DB_Game_Drop.xlsx index d6dfa2a..4baa28c 100644 Binary files a/xlsx/DB_Game_Drop.xlsx and b/xlsx/DB_Game_Drop.xlsx differ diff --git a/xlsx/DB_Task.xlsx b/xlsx/DB_Task.xlsx index fb8b3f6..2115ef3 100644 Binary files a/xlsx/DB_Task.xlsx and b/xlsx/DB_Task.xlsx differ