diff --git a/data/DB_GameFree.dat b/data/DB_GameFree.dat index 75642c8..2aee7a9 100644 Binary files a/data/DB_GameFree.dat and b/data/DB_GameFree.dat differ diff --git a/data/DB_GameFree.json b/data/DB_GameFree.json index 73842c2..3e371e8 100644 --- a/data/DB_GameFree.json +++ b/data/DB_GameFree.json @@ -55,7 +55,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2070002, @@ -112,7 +113,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2070003, @@ -169,7 +171,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2080001, @@ -226,7 +229,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2080002, @@ -283,7 +287,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2080003, @@ -340,7 +345,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2090001, @@ -397,7 +403,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2090002, @@ -454,7 +461,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2090003, @@ -511,7 +519,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2100001, @@ -568,7 +577,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2100002, @@ -625,7 +635,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2100003, @@ -682,7 +693,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2400001, @@ -739,7 +751,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2400002, @@ -796,7 +809,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2400003, @@ -852,7 +866,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2400004, @@ -907,7 +922,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2400005, @@ -962,7 +978,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2400006, @@ -1017,7 +1034,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2440001, @@ -1074,7 +1092,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2440002, @@ -1131,7 +1150,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2440003, @@ -1187,7 +1207,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2440004, @@ -1242,7 +1263,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2440005, @@ -1297,7 +1319,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2440006, @@ -1352,7 +1375,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2410001, @@ -1409,7 +1433,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2410002, @@ -1466,7 +1491,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2410003, @@ -1522,7 +1548,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2410004, @@ -1577,7 +1604,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2410005, @@ -1632,7 +1660,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2410006, @@ -1687,7 +1716,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2450001, @@ -1744,7 +1774,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2450002, @@ -1801,7 +1832,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2450003, @@ -1857,7 +1889,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2450004, @@ -1912,7 +1945,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2450005, @@ -1967,7 +2001,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2450006, @@ -2022,7 +2057,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2420001, @@ -2081,7 +2117,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2420002, @@ -2140,7 +2177,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2420003, @@ -2198,7 +2236,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2420004, @@ -2255,7 +2294,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2420005, @@ -2312,7 +2352,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2420006, @@ -2369,7 +2410,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2460001, @@ -2428,7 +2470,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2460002, @@ -2487,7 +2530,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2460003, @@ -2545,7 +2589,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2460004, @@ -2602,7 +2647,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2460005, @@ -2659,7 +2705,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2460006, @@ -2716,7 +2763,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2430001, @@ -2775,7 +2823,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2430002, @@ -2834,7 +2883,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2430003, @@ -2892,7 +2942,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2430004, @@ -2949,7 +3000,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2430005, @@ -3006,7 +3058,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2430006, @@ -3063,7 +3116,8 @@ "CreateRoomNum": 2, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2470001, @@ -3122,7 +3176,8 @@ "CreateRoomNum": 6, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2470002, @@ -3181,7 +3236,8 @@ "CreateRoomNum": 4, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2470003, @@ -3239,7 +3295,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2470004, @@ -3296,7 +3353,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2470005, @@ -3353,7 +3411,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 2470006, @@ -3410,7 +3469,8 @@ "CreateRoomNum": 3, "MatchTrueMan": 1, "PlayerWaterRate": 100, - "BetWaterRate": 100 + "BetWaterRate": 100, + "IsDrop": 1 }, { "Id": 8070001, diff --git a/data/DB_GameItem.dat b/data/DB_GameItem.dat index 150bf88..6ebc842 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 466ecdc..7836be3 100644 --- a/data/DB_GameItem.json +++ b/data/DB_GameItem.json @@ -8,7 +8,7 @@ 1 ], "Classify": [ - 1, + 0, 1, 0 ], @@ -38,7 +38,7 @@ 1 ], "Classify": [ - 1, + 0, 1, 0 ], @@ -68,7 +68,7 @@ 1 ], "Classify": [ - 1, + 0, 1, 0 ], @@ -98,7 +98,7 @@ 1 ], "Classify": [ - 1, + 0, 1, 0 ], diff --git a/data/DB_Game_Drop.dat b/data/DB_Game_Drop.dat index fef8637..7aa5a77 100644 --- a/data/DB_Game_Drop.dat +++ b/data/DB_Game_Drop.dat @@ -1,254 +1,56 @@ -(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 -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 + (2 +' (J2 +N (2 +u (2 + (2 + (2 + (2 + (2 +  (2 + + (2 + І (2 + ح (2 +  (2 + (2 + (2 + (2 + ( 2 + ( 2 + ( +2 + ( 2 + ( 2 + (2 + (2 + (2 + ("2 + ((2 + (.2 +л (42 + (:2 +! (?2 +$ (E2 + ' (K2 +!* (N2 +"- (N2 +#0 (N2 +$3 (N2 +%6 (N2 +&9 (N2 +'= (N2 +(z (N2 +) (N2 +* (N2  ++Ó (N2 +, (N2 +- (N2#' +. (N2+/ +/ (N226 +0 (N29= +1ʺ (N2AE +2 (N2HL +3/ (N2 +4G (N2 +5_ (N2 \ No newline at end of file diff --git a/data/DB_Game_Drop.json b/data/DB_Game_Drop.json index acda596..f02694a 100644 --- a/data/DB_Game_Drop.json +++ b/data/DB_Game_Drop.json @@ -2,7 +2,6 @@ "Arr": [ { "Id": 1, - "GameId": 207, "Bet": 2000, "ItemId1": 30001, "Rate1": 30, @@ -13,7 +12,6 @@ }, { "Id": 2, - "GameId": 207, "Bet": 5000, "ItemId1": 30001, "Rate1": 74, @@ -24,7 +22,6 @@ }, { "Id": 3, - "GameId": 207, "Bet": 10000, "ItemId1": 30001, "Rate1": 149, @@ -35,7 +32,6 @@ }, { "Id": 4, - "GameId": 207, "Bet": 15000, "ItemId1": 30001, "Rate1": 223, @@ -46,7 +42,6 @@ }, { "Id": 5, - "GameId": 207, "Bet": 20000, "ItemId1": 30001, "Rate1": 297, @@ -57,7 +52,6 @@ }, { "Id": 6, - "GameId": 207, "Bet": 25000, "ItemId1": 30001, "Rate1": 371, @@ -68,7 +62,6 @@ }, { "Id": 7, - "GameId": 207, "Bet": 30000, "ItemId1": 30001, "Rate1": 446, @@ -79,7 +72,6 @@ }, { "Id": 8, - "GameId": 207, "Bet": 35000, "ItemId1": 30001, "Rate1": 520, @@ -90,7 +82,6 @@ }, { "Id": 9, - "GameId": 207, "Bet": 40000, "ItemId1": 30001, "Rate1": 594, @@ -101,7 +92,6 @@ }, { "Id": 10, - "GameId": 207, "Bet": 45000, "ItemId1": 30001, "Rate1": 668, @@ -112,7 +102,6 @@ }, { "Id": 11, - "GameId": 207, "Bet": 50000, "ItemId1": 30001, "Rate1": 743, @@ -123,7 +112,6 @@ }, { "Id": 12, - "GameId": 207, "Bet": 55000, "ItemId1": 30001, "Rate1": 817, @@ -134,7 +122,6 @@ }, { "Id": 13, - "GameId": 207, "Bet": 60000, "ItemId1": 30001, "Rate1": 891, @@ -145,7 +132,6 @@ }, { "Id": 14, - "GameId": 207, "Bet": 65000, "ItemId1": 30001, "Rate1": 965, @@ -156,7 +142,6 @@ }, { "Id": 15, - "GameId": 207, "Bet": 70000, "ItemId1": 30001, "Rate1": 1040, @@ -167,7 +152,6 @@ }, { "Id": 16, - "GameId": 207, "Bet": 75000, "ItemId1": 30001, "Rate1": 1114, @@ -178,7 +162,6 @@ }, { "Id": 17, - "GameId": 207, "Bet": 80000, "ItemId1": 30001, "Rate1": 1188, @@ -189,7 +172,6 @@ }, { "Id": 18, - "GameId": 207, "Bet": 85000, "ItemId1": 30001, "Rate1": 1262, @@ -200,7 +182,6 @@ }, { "Id": 19, - "GameId": 207, "Bet": 90000, "ItemId1": 30001, "Rate1": 1337, @@ -211,7 +192,6 @@ }, { "Id": 20, - "GameId": 207, "Bet": 95000, "ItemId1": 30001, "Rate1": 1411, @@ -222,7 +202,6 @@ }, { "Id": 21, - "GameId": 207, "Bet": 100000, "ItemId1": 30001, "Rate1": 1485, @@ -233,7 +212,6 @@ }, { "Id": 22, - "GameId": 207, "Bet": 150000, "ItemId1": 30001, "Rate1": 2228, @@ -244,7 +222,6 @@ }, { "Id": 23, - "GameId": 207, "Bet": 200000, "ItemId1": 30001, "Rate1": 2970, @@ -255,7 +232,6 @@ }, { "Id": 24, - "GameId": 207, "Bet": 250000, "ItemId1": 30001, "Rate1": 3713, @@ -266,7 +242,6 @@ }, { "Id": 25, - "GameId": 207, "Bet": 300000, "ItemId1": 30001, "Rate1": 4455, @@ -277,7 +252,6 @@ }, { "Id": 26, - "GameId": 207, "Bet": 350000, "ItemId1": 30001, "Rate1": 5198, @@ -288,7 +262,6 @@ }, { "Id": 27, - "GameId": 207, "Bet": 400000, "ItemId1": 30001, "Rate1": 5940, @@ -299,7 +272,6 @@ }, { "Id": 28, - "GameId": 207, "Bet": 450000, "ItemId1": 30001, "Rate1": 6683, @@ -310,7 +282,6 @@ }, { "Id": 29, - "GameId": 207, "Bet": 500000, "ItemId1": 30001, "Rate1": 7425, @@ -321,7 +292,6 @@ }, { "Id": 30, - "GameId": 207, "Bet": 550000, "ItemId1": 30001, "Rate1": 8168, @@ -332,7 +302,6 @@ }, { "Id": 31, - "GameId": 207, "Bet": 600000, "ItemId1": 30001, "Rate1": 8910, @@ -343,7 +312,6 @@ }, { "Id": 32, - "GameId": 207, "Bet": 650000, "ItemId1": 30001, "Rate1": 9653, @@ -354,7 +322,6 @@ }, { "Id": 33, - "GameId": 207, "Bet": 700000, "ItemId1": 30001, "Rate1": 10000, @@ -365,7 +332,6 @@ }, { "Id": 34, - "GameId": 207, "Bet": 750000, "ItemId1": 30001, "Rate1": 10000, @@ -376,7 +342,6 @@ }, { "Id": 35, - "GameId": 207, "Bet": 800000, "ItemId1": 30001, "Rate1": 10000, @@ -387,7 +352,6 @@ }, { "Id": 36, - "GameId": 207, "Bet": 850000, "ItemId1": 30001, "Rate1": 10000, @@ -398,7 +362,6 @@ }, { "Id": 37, - "GameId": 207, "Bet": 900000, "ItemId1": 30001, "Rate1": 10000, @@ -409,7 +372,6 @@ }, { "Id": 38, - "GameId": 207, "Bet": 950000, "ItemId1": 30001, "Rate1": 10000, @@ -420,7 +382,6 @@ }, { "Id": 39, - "GameId": 207, "Bet": 1000000, "ItemId1": 30001, "Rate1": 10000, @@ -431,7 +392,6 @@ }, { "Id": 40, - "GameId": 207, "Bet": 2000000, "ItemId1": 30001, "Rate1": 10000, @@ -442,7 +402,6 @@ }, { "Id": 41, - "GameId": 207, "Bet": 5000000, "ItemId1": 30001, "Rate1": 10000, @@ -453,7 +412,6 @@ }, { "Id": 42, - "GameId": 207, "Bet": 10000000, "ItemId1": 30001, "Rate1": 10000, @@ -464,7 +422,6 @@ }, { "Id": 43, - "GameId": 207, "Bet": 15000000, "ItemId1": 30001, "Rate1": 10000, @@ -475,7 +432,6 @@ }, { "Id": 44, - "GameId": 207, "Bet": 20000000, "ItemId1": 30001, "Rate1": 10000, @@ -486,7 +442,6 @@ }, { "Id": 45, - "GameId": 207, "Bet": 25000000, "ItemId1": 30001, "Rate1": 10000, @@ -497,7 +452,6 @@ }, { "Id": 46, - "GameId": 207, "Bet": 30000000, "ItemId1": 30001, "Rate1": 10000, @@ -508,7 +462,6 @@ }, { "Id": 47, - "GameId": 207, "Bet": 35000000, "ItemId1": 30001, "Rate1": 10000, @@ -519,7 +472,6 @@ }, { "Id": 48, - "GameId": 207, "Bet": 40000000, "ItemId1": 30001, "Rate1": 10000, @@ -530,7 +482,6 @@ }, { "Id": 49, - "GameId": 207, "Bet": 45000000, "ItemId1": 30001, "Rate1": 10000, @@ -541,7 +492,6 @@ }, { "Id": 50, - "GameId": 207, "Bet": 50000000, "ItemId1": 30001, "Rate1": 10000, @@ -552,1778 +502,26 @@ }, { "Id": 51, - "GameId": 208, - "Bet": 2000, + "Bet": 100000000, "ItemId1": 30001, - "Rate1": 30, + "Rate1": 10000, "Amount1": [ - 1, - 1 + 147, + 151 ] }, { "Id": 52, - "GameId": 208, - "Bet": 5000, + "Bet": 150000000, "ItemId1": 30001, - "Rate1": 74, + "Rate1": 10000, "Amount1": [ - 1, - 1 + 221, + 225 ] }, { "Id": 53, - "GameId": 208, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 54, - "GameId": 208, - "Bet": 15000, - "ItemId1": 30001, - "Rate1": 223, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 55, - "GameId": 208, - "Bet": 20000, - "ItemId1": 30001, - "Rate1": 297, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 56, - "GameId": 208, - "Bet": 25000, - "ItemId1": 30001, - "Rate1": 371, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 57, - "GameId": 208, - "Bet": 30000, - "ItemId1": 30001, - "Rate1": 446, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 58, - "GameId": 208, - "Bet": 35000, - "ItemId1": 30001, - "Rate1": 520, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 59, - "GameId": 208, - "Bet": 40000, - "ItemId1": 30001, - "Rate1": 594, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 60, - "GameId": 208, - "Bet": 45000, - "ItemId1": 30001, - "Rate1": 668, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 61, - "GameId": 208, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 62, - "GameId": 208, - "Bet": 55000, - "ItemId1": 30001, - "Rate1": 817, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 63, - "GameId": 208, - "Bet": 60000, - "ItemId1": 30001, - "Rate1": 891, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 64, - "GameId": 208, - "Bet": 65000, - "ItemId1": 30001, - "Rate1": 965, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 65, - "GameId": 208, - "Bet": 70000, - "ItemId1": 30001, - "Rate1": 1040, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 66, - "GameId": 208, - "Bet": 75000, - "ItemId1": 30001, - "Rate1": 1114, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 67, - "GameId": 208, - "Bet": 80000, - "ItemId1": 30001, - "Rate1": 1188, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 68, - "GameId": 208, - "Bet": 85000, - "ItemId1": 30001, - "Rate1": 1262, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 69, - "GameId": 208, - "Bet": 90000, - "ItemId1": 30001, - "Rate1": 1337, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 70, - "GameId": 208, - "Bet": 95000, - "ItemId1": 30001, - "Rate1": 1411, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 71, - "GameId": 208, - "Bet": 100000, - "ItemId1": 30001, - "Rate1": 1485, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 72, - "GameId": 208, - "Bet": 150000, - "ItemId1": 30001, - "Rate1": 2228, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 73, - "GameId": 208, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 74, - "GameId": 208, - "Bet": 250000, - "ItemId1": 30001, - "Rate1": 3713, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 75, - "GameId": 208, - "Bet": 300000, - "ItemId1": 30001, - "Rate1": 4455, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 76, - "GameId": 208, - "Bet": 350000, - "ItemId1": 30001, - "Rate1": 5198, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 77, - "GameId": 208, - "Bet": 400000, - "ItemId1": 30001, - "Rate1": 5940, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 78, - "GameId": 208, - "Bet": 450000, - "ItemId1": 30001, - "Rate1": 6683, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 79, - "GameId": 208, - "Bet": 500000, - "ItemId1": 30001, - "Rate1": 7425, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 80, - "GameId": 208, - "Bet": 550000, - "ItemId1": 30001, - "Rate1": 8168, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 81, - "GameId": 208, - "Bet": 600000, - "ItemId1": 30001, - "Rate1": 8910, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 82, - "GameId": 208, - "Bet": 650000, - "ItemId1": 30001, - "Rate1": 9653, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 83, - "GameId": 208, - "Bet": 700000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 84, - "GameId": 208, - "Bet": 750000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 85, - "GameId": 208, - "Bet": 800000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 86, - "GameId": 208, - "Bet": 850000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 87, - "GameId": 208, - "Bet": 900000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 88, - "GameId": 208, - "Bet": 950000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 89, - "GameId": 208, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 90, - "GameId": 208, - "Bet": 2000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 1, - 5 - ] - }, - { - "Id": 91, - "GameId": 208, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 92, - "GameId": 208, - "Bet": 10000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 13, - 17 - ] - }, - { - "Id": 93, - "GameId": 208, - "Bet": 15000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 20, - 24 - ] - }, - { - "Id": 94, - "GameId": 208, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 95, - "GameId": 208, - "Bet": 25000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 35, - 39 - ] - }, - { - "Id": 96, - "GameId": 208, - "Bet": 30000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 43, - 47 - ] - }, - { - "Id": 97, - "GameId": 208, - "Bet": 35000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 50, - 54 - ] - }, - { - "Id": 98, - "GameId": 208, - "Bet": 40000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 57, - 61 - ] - }, - { - "Id": 99, - "GameId": 208, - "Bet": 45000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 65, - 69 - ] - }, - { - "Id": 100, - "GameId": 208, - "Bet": 50000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 72, - 76 - ] - }, - { - "Id": 101, - "GameId": 209, - "Bet": 2000, - "ItemId1": 30001, - "Rate1": 30, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 102, - "GameId": 209, - "Bet": 5000, - "ItemId1": 30001, - "Rate1": 74, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 103, - "GameId": 209, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 104, - "GameId": 209, - "Bet": 15000, - "ItemId1": 30001, - "Rate1": 223, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 105, - "GameId": 209, - "Bet": 20000, - "ItemId1": 30001, - "Rate1": 297, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 106, - "GameId": 209, - "Bet": 25000, - "ItemId1": 30001, - "Rate1": 371, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 107, - "GameId": 209, - "Bet": 30000, - "ItemId1": 30001, - "Rate1": 446, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 108, - "GameId": 209, - "Bet": 35000, - "ItemId1": 30001, - "Rate1": 520, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 109, - "GameId": 209, - "Bet": 40000, - "ItemId1": 30001, - "Rate1": 594, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 110, - "GameId": 209, - "Bet": 45000, - "ItemId1": 30001, - "Rate1": 668, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 111, - "GameId": 209, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 112, - "GameId": 209, - "Bet": 55000, - "ItemId1": 30001, - "Rate1": 817, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 113, - "GameId": 209, - "Bet": 60000, - "ItemId1": 30001, - "Rate1": 891, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 114, - "GameId": 209, - "Bet": 65000, - "ItemId1": 30001, - "Rate1": 965, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 115, - "GameId": 209, - "Bet": 70000, - "ItemId1": 30001, - "Rate1": 1040, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 116, - "GameId": 209, - "Bet": 75000, - "ItemId1": 30001, - "Rate1": 1114, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 117, - "GameId": 209, - "Bet": 80000, - "ItemId1": 30001, - "Rate1": 1188, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 118, - "GameId": 209, - "Bet": 85000, - "ItemId1": 30001, - "Rate1": 1262, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 119, - "GameId": 209, - "Bet": 90000, - "ItemId1": 30001, - "Rate1": 1337, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 120, - "GameId": 209, - "Bet": 95000, - "ItemId1": 30001, - "Rate1": 1411, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 121, - "GameId": 209, - "Bet": 100000, - "ItemId1": 30001, - "Rate1": 1485, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 122, - "GameId": 209, - "Bet": 150000, - "ItemId1": 30001, - "Rate1": 2228, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 123, - "GameId": 209, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 124, - "GameId": 209, - "Bet": 250000, - "ItemId1": 30001, - "Rate1": 3713, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 125, - "GameId": 209, - "Bet": 300000, - "ItemId1": 30001, - "Rate1": 4455, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 126, - "GameId": 209, - "Bet": 350000, - "ItemId1": 30001, - "Rate1": 5198, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 127, - "GameId": 209, - "Bet": 400000, - "ItemId1": 30001, - "Rate1": 5940, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 128, - "GameId": 209, - "Bet": 450000, - "ItemId1": 30001, - "Rate1": 6683, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 129, - "GameId": 209, - "Bet": 500000, - "ItemId1": 30001, - "Rate1": 7425, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 130, - "GameId": 209, - "Bet": 550000, - "ItemId1": 30001, - "Rate1": 8168, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 131, - "GameId": 209, - "Bet": 600000, - "ItemId1": 30001, - "Rate1": 8910, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 132, - "GameId": 209, - "Bet": 650000, - "ItemId1": 30001, - "Rate1": 9653, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 133, - "GameId": 209, - "Bet": 700000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 134, - "GameId": 209, - "Bet": 750000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 135, - "GameId": 209, - "Bet": 800000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 136, - "GameId": 209, - "Bet": 850000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 137, - "GameId": 209, - "Bet": 900000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 138, - "GameId": 209, - "Bet": 950000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 139, - "GameId": 209, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 140, - "GameId": 209, - "Bet": 2000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 1, - 5 - ] - }, - { - "Id": 141, - "GameId": 209, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 142, - "GameId": 209, - "Bet": 10000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 13, - 17 - ] - }, - { - "Id": 143, - "GameId": 209, - "Bet": 15000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 20, - 24 - ] - }, - { - "Id": 144, - "GameId": 209, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 145, - "GameId": 209, - "Bet": 25000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 35, - 39 - ] - }, - { - "Id": 146, - "GameId": 209, - "Bet": 30000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 43, - 47 - ] - }, - { - "Id": 147, - "GameId": 209, - "Bet": 35000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 50, - 54 - ] - }, - { - "Id": 148, - "GameId": 209, - "Bet": 40000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 57, - 61 - ] - }, - { - "Id": 149, - "GameId": 209, - "Bet": 45000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 65, - 69 - ] - }, - { - "Id": 150, - "GameId": 209, - "Bet": 50000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 72, - 76 - ] - }, - { - "Id": 151, - "GameId": 210, - "Bet": 2000, - "ItemId1": 30001, - "Rate1": 30, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 152, - "GameId": 210, - "Bet": 5000, - "ItemId1": 30001, - "Rate1": 74, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 153, - "GameId": 210, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 154, - "GameId": 210, - "Bet": 15000, - "ItemId1": 30001, - "Rate1": 223, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 155, - "GameId": 210, - "Bet": 20000, - "ItemId1": 30001, - "Rate1": 297, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 156, - "GameId": 210, - "Bet": 25000, - "ItemId1": 30001, - "Rate1": 371, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 157, - "GameId": 210, - "Bet": 30000, - "ItemId1": 30001, - "Rate1": 446, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 158, - "GameId": 210, - "Bet": 35000, - "ItemId1": 30001, - "Rate1": 520, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 159, - "GameId": 210, - "Bet": 40000, - "ItemId1": 30001, - "Rate1": 594, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 160, - "GameId": 210, - "Bet": 45000, - "ItemId1": 30001, - "Rate1": 668, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 161, - "GameId": 210, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 162, - "GameId": 210, - "Bet": 55000, - "ItemId1": 30001, - "Rate1": 817, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 163, - "GameId": 210, - "Bet": 60000, - "ItemId1": 30001, - "Rate1": 891, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 164, - "GameId": 210, - "Bet": 65000, - "ItemId1": 30001, - "Rate1": 965, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 165, - "GameId": 210, - "Bet": 70000, - "ItemId1": 30001, - "Rate1": 1040, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 166, - "GameId": 210, - "Bet": 75000, - "ItemId1": 30001, - "Rate1": 1114, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 167, - "GameId": 210, - "Bet": 80000, - "ItemId1": 30001, - "Rate1": 1188, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 168, - "GameId": 210, - "Bet": 85000, - "ItemId1": 30001, - "Rate1": 1262, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 169, - "GameId": 210, - "Bet": 90000, - "ItemId1": 30001, - "Rate1": 1337, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 170, - "GameId": 210, - "Bet": 95000, - "ItemId1": 30001, - "Rate1": 1411, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 171, - "GameId": 210, - "Bet": 100000, - "ItemId1": 30001, - "Rate1": 1485, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 172, - "GameId": 210, - "Bet": 150000, - "ItemId1": 30001, - "Rate1": 2228, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 173, - "GameId": 210, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 174, - "GameId": 210, - "Bet": 250000, - "ItemId1": 30001, - "Rate1": 3713, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 175, - "GameId": 210, - "Bet": 300000, - "ItemId1": 30001, - "Rate1": 4455, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 176, - "GameId": 210, - "Bet": 350000, - "ItemId1": 30001, - "Rate1": 5198, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 177, - "GameId": 210, - "Bet": 400000, - "ItemId1": 30001, - "Rate1": 5940, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 178, - "GameId": 210, - "Bet": 450000, - "ItemId1": 30001, - "Rate1": 6683, - "Amount1": [ - 1, - 2 - ] - }, - { - "Id": 179, - "GameId": 210, - "Bet": 500000, - "ItemId1": 30001, - "Rate1": 7425, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 180, - "GameId": 210, - "Bet": 550000, - "ItemId1": 30001, - "Rate1": 8168, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 181, - "GameId": 210, - "Bet": 600000, - "ItemId1": 30001, - "Rate1": 8910, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 182, - "GameId": 210, - "Bet": 650000, - "ItemId1": 30001, - "Rate1": 9653, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 183, - "GameId": 210, - "Bet": 700000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 184, - "GameId": 210, - "Bet": 750000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 185, - "GameId": 210, - "Bet": 800000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 186, - "GameId": 210, - "Bet": 850000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 2, - 4 - ] - }, - { - "Id": 187, - "GameId": 210, - "Bet": 900000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 188, - "GameId": 210, - "Bet": 950000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 189, - "GameId": 210, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 190, - "GameId": 210, - "Bet": 2000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 1, - 5 - ] - }, - { - "Id": 191, - "GameId": 210, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 192, - "GameId": 210, - "Bet": 10000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 13, - 17 - ] - }, - { - "Id": 193, - "GameId": 210, - "Bet": 15000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 20, - 24 - ] - }, - { - "Id": 194, - "GameId": 210, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 195, - "GameId": 210, - "Bet": 25000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 35, - 39 - ] - }, - { - "Id": 196, - "GameId": 210, - "Bet": 30000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 43, - 47 - ] - }, - { - "Id": 197, - "GameId": 210, - "Bet": 35000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 50, - 54 - ] - }, - { - "Id": 198, - "GameId": 210, - "Bet": 40000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 57, - 61 - ] - }, - { - "Id": 199, - "GameId": 210, - "Bet": 45000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 65, - 69 - ] - }, - { - "Id": 200, - "GameId": 210, - "Bet": 50000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 72, - 76 - ] - }, - { - "Id": 201, - "GameId": 240, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 202, - "GameId": 240, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 203, - "GameId": 240, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 204, - "GameId": 240, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 205, - "GameId": 240, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 206, - "GameId": 240, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 207, - "GameId": 244, - "Bet": 100000, - "ItemId1": 30001, - "Rate1": 1485, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 208, - "GameId": 244, - "Bet": 500000, - "ItemId1": 30001, - "Rate1": 7425, - "Amount1": [ - 2, - 3 - ] - }, - { - "Id": 209, - "GameId": 244, - "Bet": 2000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 1, - 5 - ] - }, - { - "Id": 210, - "GameId": 244, - "Bet": 10000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 13, - 17 - ] - }, - { - "Id": 211, - "GameId": 244, - "Bet": 50000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 72, - 76 - ] - }, - { - "Id": 212, - "GameId": 244, "Bet": 200000000, "ItemId1": 30001, "Rate1": 10000, @@ -2331,402 +529,6 @@ 295, 299 ] - }, - { - "Id": 213, - "GameId": 241, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 214, - "GameId": 241, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 215, - "GameId": 241, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 216, - "GameId": 241, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 217, - "GameId": 241, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 218, - "GameId": 241, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 219, - "GameId": 245, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 220, - "GameId": 245, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 221, - "GameId": 245, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 222, - "GameId": 245, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 223, - "GameId": 245, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 224, - "GameId": 245, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 225, - "GameId": 242, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 226, - "GameId": 242, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 227, - "GameId": 242, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 228, - "GameId": 242, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 229, - "GameId": 242, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 230, - "GameId": 242, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 231, - "GameId": 246, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 232, - "GameId": 246, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 233, - "GameId": 246, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 234, - "GameId": 246, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 235, - "GameId": 246, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 236, - "GameId": 246, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 237, - "GameId": 243, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 238, - "GameId": 243, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 239, - "GameId": 243, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 240, - "GameId": 243, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 241, - "GameId": 243, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 242, - "GameId": 243, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] - }, - { - "Id": 243, - "GameId": 247, - "Bet": 10000, - "ItemId1": 30001, - "Rate1": 149, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 244, - "GameId": 247, - "Bet": 50000, - "ItemId1": 30001, - "Rate1": 743, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 245, - "GameId": 247, - "Bet": 200000, - "ItemId1": 30001, - "Rate1": 2970, - "Amount1": [ - 1, - 1 - ] - }, - { - "Id": 246, - "GameId": 247, - "Bet": 1000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 3, - 5 - ] - }, - { - "Id": 247, - "GameId": 247, - "Bet": 5000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 5, - 9 - ] - }, - { - "Id": 248, - "GameId": 247, - "Bet": 20000000, - "ItemId1": 30001, - "Rate1": 10000, - "Amount1": [ - 28, - 32 - ] } ] } \ No newline at end of file diff --git a/data/DB_Pigbank_Prop.dat b/data/DB_Pigbank_Prop.dat index 834693b..5e79d7a 100644 --- a/data/DB_Pigbank_Prop.dat +++ b/data/DB_Pigbank_Prop.dat @@ -2,3 +2,5 @@  BankMaxCoin  WinCoinRate  LoseCoinRate + + DayBuyMaxCnt \ No newline at end of file diff --git a/data/DB_Pigbank_Prop.json b/data/DB_Pigbank_Prop.json index 2e89e10..0bc78d1 100644 --- a/data/DB_Pigbank_Prop.json +++ b/data/DB_Pigbank_Prop.json @@ -14,6 +14,11 @@ "Id": 3, "PorpName": "LoseCoinRate", "PropValue": 10 + }, + { + "Id": 4, + "PorpName": "DayBuyMaxCnt", + "PropValue": 2 } ] } \ No newline at end of file diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 0984e67..54a375b 100644 --- a/data/DB_PropExchange.dat +++ b/data/DB_PropExchange.dat @@ -1,5 +1,5 @@ -6ֆ׆ӆԆՆ"= -.؆نچۆ"= -Wچۆӆֆ׆؆ԆՆن"  -]Ԇֆ؆چۆ܆ӆ׆نՆ" \ No newline at end of file +6ԆՆֆ׆ӆ"= +.نچۆ؆"= +WۆԆՆֆ؆نӆ׆چ"  +]Ԇ׆؆ۆچ܆ӆՆֆن" \ No newline at end of file diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 0975baa..c0f72e7 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/gamesrv/base/scene.go b/gamesrv/base/scene.go index ea3eb3f..a0930ab 100644 --- a/gamesrv/base/scene.go +++ b/gamesrv/base/scene.go @@ -2120,13 +2120,18 @@ func (this *Scene) TryBillExGameDrop(p *Player) { return } + // 场次掉落开关 + if this.DbGameFree.IsDrop != 1 { + return + } + // 渠道开关 conf := ConfigMgrInst.GetConfig(p.Platform).ChannelSwitch[common.ChannelSwitchDropItem] if !model.GameParamData.CloseChannelSwitch && (conf == nil || !common.InSliceString(conf.OnChannelName, p.AppChannel)) { return } - dropInfo := srvdata.GameDropMgrSingleton.GetDropInfoByBaseScore(int32(this.GameId), baseScore) + dropInfo := srvdata.GameDropMgrSingleton.GetDropInfoByBaseScore(baseScore) if dropInfo != nil && len(dropInfo) != 0 && p.Items != nil { realDrop := make(map[int32]int32) for _, drop := range dropInfo { diff --git a/protocol/server/pbdata.pb.go b/protocol/server/pbdata.pb.go index 4ba6722..5292ed0 100644 --- a/protocol/server/pbdata.pb.go +++ b/protocol/server/pbdata.pb.go @@ -4301,6 +4301,7 @@ type DB_GameFree struct { DiamondDrop int32 `protobuf:"varint,69,opt,name=DiamondDrop,proto3" json:"DiamondDrop,omitempty"` NegativeMax int32 `protobuf:"varint,70,opt,name=NegativeMax,proto3" json:"NegativeMax,omitempty"` RatioMax int32 `protobuf:"varint,71,opt,name=RatioMax,proto3" json:"RatioMax,omitempty"` + IsDrop int32 `protobuf:"varint,72,opt,name=IsDrop,proto3" json:"IsDrop,omitempty"` } func (x *DB_GameFree) Reset() { @@ -4832,6 +4833,13 @@ func (x *DB_GameFree) GetRatioMax() int32 { return 0 } +func (x *DB_GameFree) GetIsDrop() int32 { + if x != nil { + return x.IsDrop + } + return 0 +} + type DB_GameFreeArray struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -5509,12 +5517,11 @@ type DB_Game_Drop struct { unknownFields protoimpl.UnknownFields Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` - GameId int32 `protobuf:"varint,2,opt,name=GameId,proto3" json:"GameId,omitempty"` - Bet int32 `protobuf:"varint,3,opt,name=Bet,proto3" json:"Bet,omitempty"` - ItemName1 int32 `protobuf:"varint,4,opt,name=ItemName1,proto3" json:"ItemName1,omitempty"` - ItemId1 int32 `protobuf:"varint,5,opt,name=ItemId1,proto3" json:"ItemId1,omitempty"` - Rate1 int32 `protobuf:"varint,6,opt,name=Rate1,proto3" json:"Rate1,omitempty"` - Amount1 []int32 `protobuf:"varint,7,rep,packed,name=Amount1,proto3" json:"Amount1,omitempty"` + Bet int32 `protobuf:"varint,2,opt,name=Bet,proto3" json:"Bet,omitempty"` + ItemName1 int32 `protobuf:"varint,3,opt,name=ItemName1,proto3" json:"ItemName1,omitempty"` + ItemId1 int32 `protobuf:"varint,4,opt,name=ItemId1,proto3" json:"ItemId1,omitempty"` + Rate1 int32 `protobuf:"varint,5,opt,name=Rate1,proto3" json:"Rate1,omitempty"` + Amount1 []int32 `protobuf:"varint,6,rep,packed,name=Amount1,proto3" json:"Amount1,omitempty"` } func (x *DB_Game_Drop) Reset() { @@ -5556,13 +5563,6 @@ func (x *DB_Game_Drop) GetId() int32 { return 0 } -func (x *DB_Game_Drop) GetGameId() int32 { - if x != nil { - return x.GameId - } - return 0 -} - func (x *DB_Game_Drop) GetBet() int32 { if x != nil { return x.Bet @@ -10652,7 +10652,7 @@ var file_pbdata_proto_rawDesc = []byte{ 0x47, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6f, 0x6f, 0x6c, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x29, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x43, - 0x6f, 0x69, 0x6e, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xa5, 0x11, 0x0a, + 0x6f, 0x69, 0x6e, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xbd, 0x11, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, @@ -10791,98 +10791,98 @@ var file_pbdata_proto_rawDesc = []byte{ 0x76, 0x65, 0x4d, 0x61, 0x78, 0x18, 0x46, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x4e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x18, 0x47, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x61, 0x74, 0x69, - 0x6f, 0x4d, 0x61, 0x78, 0x22, 0x39, 0x0a, 0x10, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x46, - 0x72, 0x65, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x25, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, - 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, - 0xad, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, - 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, - 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x68, 0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x53, 0x68, 0x6f, 0x77, 0x4c, - 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6c, 0x61, 0x73, 0x73, - 0x69, 0x66, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6c, 0x61, 0x73, 0x73, - 0x69, 0x66, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x66, 0x66, 0x65, 0x63, - 0x74, 0x30, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, - 0x30, 0x12, 0x16, 0x0a, 0x06, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, - 0x05, 0x52, 0x06, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x61, 0x6c, - 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x61, 0x6c, - 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x61, 0x6c, 0x65, 0x47, 0x6f, 0x6c, - 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x61, 0x6c, 0x65, 0x47, 0x6f, 0x6c, - 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x4d, 0x61, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x43, 0x6f, 0x6d, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x12, - 0x1a, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x44, - 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x44, - 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x0f, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, - 0x39, 0x0a, 0x10, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x41, 0x72, - 0x72, 0x61, 0x79, 0x12, 0x25, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x13, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, - 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x87, 0x02, 0x0a, 0x11, 0x44, - 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, - 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, - 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, - 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, - 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x6f, 0x62, 0x6f, 0x74, 0x55, 0x70, 0x52, 0x61, 0x74, 0x69, 0x6f, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x52, 0x6f, 0x62, 0x6f, 0x74, 0x55, 0x70, 0x52, - 0x61, 0x74, 0x69, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x55, 0x70, 0x47, 0x72, 0x61, 0x64, 0x65, 0x18, - 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x55, 0x70, 0x47, 0x72, 0x61, 0x64, 0x65, 0x12, 0x20, - 0x0a, 0x0b, 0x55, 0x70, 0x47, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x64, 0x64, 0x73, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x05, 0x52, 0x0b, 0x55, 0x70, 0x47, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x64, 0x64, 0x73, - 0x12, 0x1c, 0x0a, 0x09, 0x44, 0x6f, 0x77, 0x6e, 0x47, 0x72, 0x61, 0x64, 0x65, 0x18, 0x07, 0x20, - 0x03, 0x28, 0x05, 0x52, 0x09, 0x44, 0x6f, 0x77, 0x6e, 0x47, 0x72, 0x61, 0x64, 0x65, 0x12, 0x24, - 0x0a, 0x0d, 0x44, 0x6f, 0x77, 0x6e, 0x47, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x64, 0x64, 0x73, 0x18, - 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x44, 0x6f, 0x77, 0x6e, 0x47, 0x72, 0x61, 0x64, 0x65, - 0x4f, 0x64, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x16, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x4d, - 0x61, 0x74, 0x63, 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x2b, - 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, - 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xb3, 0x01, 0x0a, 0x0b, - 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, - 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x4d, - 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x4d, - 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20, - 0x03, 0x28, 0x05, 0x52, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, - 0x75, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, - 0x75, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x61, 0x6d, 0x65, 0x44, - 0x69, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x47, 0x61, 0x6d, 0x65, 0x44, 0x69, - 0x66, 0x22, 0x39, 0x0a, 0x10, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x75, 0x6c, 0x65, - 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x25, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, - 0x61, 0x6d, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x64, 0x0a, 0x0e, - 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x69, 0x64, 0x79, 0x12, 0x0e, - 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1a, - 0x0a, 0x08, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x4e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x47, 0x65, - 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x47, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x05, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x54, 0x69, 0x6d, - 0x65, 0x73, 0x22, 0x3f, 0x0a, 0x13, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x53, 0x75, 0x62, - 0x73, 0x69, 0x64, 0x79, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x28, 0x0a, 0x03, 0x41, 0x72, 0x72, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, - 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x69, 0x64, 0x79, 0x52, 0x03, - 0x41, 0x72, 0x72, 0x22, 0xb0, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x5f, - 0x44, 0x72, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, - 0x42, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x42, 0x65, 0x74, 0x12, 0x1c, - 0x0a, 0x09, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x6f, 0x4d, 0x61, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x44, 0x72, 0x6f, 0x70, 0x18, 0x48, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x73, 0x44, 0x72, 0x6f, 0x70, 0x22, 0x39, 0x0a, 0x10, + 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, + 0x12, 0x25, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72, + 0x65, 0x65, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xad, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x47, + 0x61, 0x6d, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x53, + 0x68, 0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x0c, 0x53, 0x68, 0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x1a, 0x0a, 0x08, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x69, 0x66, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x08, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x69, 0x66, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x54, + 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x18, 0x0a, 0x07, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x30, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x07, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x30, 0x12, 0x16, 0x0a, 0x06, 0x45, 0x66, 0x66, + 0x65, 0x63, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x45, 0x66, 0x66, 0x65, 0x63, + 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x61, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x61, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, + 0x08, 0x53, 0x61, 0x6c, 0x65, 0x47, 0x6f, 0x6c, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x53, 0x61, 0x6c, 0x65, 0x47, 0x6f, 0x6c, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, + 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x43, + 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x61, 0x78, 0x18, 0x0b, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x4d, 0x61, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x18, + 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, + 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75, + 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x39, 0x0a, 0x10, 0x44, 0x42, 0x5f, 0x47, 0x61, + 0x6d, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x25, 0x0a, 0x03, 0x41, + 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, + 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x03, 0x41, + 0x72, 0x72, 0x22, 0x87, 0x02, 0x0a, 0x11, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, + 0x74, 0x63, 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x6d, 0x65, + 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x47, 0x61, + 0x6d, 0x65, 0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x61, 0x74, 0x63, + 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4d, 0x61, + 0x74, 0x63, 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x6f, 0x62, 0x6f, + 0x74, 0x55, 0x70, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, + 0x52, 0x6f, 0x62, 0x6f, 0x74, 0x55, 0x70, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x12, 0x18, 0x0a, 0x07, + 0x55, 0x70, 0x47, 0x72, 0x61, 0x64, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x55, + 0x70, 0x47, 0x72, 0x61, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x55, 0x70, 0x47, 0x72, 0x61, 0x64, + 0x65, 0x4f, 0x64, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x55, 0x70, 0x47, + 0x72, 0x61, 0x64, 0x65, 0x4f, 0x64, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x44, 0x6f, 0x77, 0x6e, + 0x47, 0x72, 0x61, 0x64, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x44, 0x6f, 0x77, + 0x6e, 0x47, 0x72, 0x61, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x44, 0x6f, 0x77, 0x6e, 0x47, 0x72, + 0x61, 0x64, 0x65, 0x4f, 0x64, 0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x44, + 0x6f, 0x77, 0x6e, 0x47, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x64, 0x64, 0x73, 0x22, 0x45, 0x0a, 0x16, + 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x65, 0x76, 0x65, + 0x6c, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x2b, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, + 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x03, + 0x41, 0x72, 0x72, 0x22, 0xb3, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x52, + 0x75, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, + 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, + 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x50, 0x61, 0x72, + 0x61, 0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x75, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x75, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x12, + 0x18, 0x0a, 0x07, 0x47, 0x61, 0x6d, 0x65, 0x44, 0x69, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x47, 0x61, 0x6d, 0x65, 0x44, 0x69, 0x66, 0x22, 0x39, 0x0a, 0x10, 0x44, 0x42, 0x5f, + 0x47, 0x61, 0x6d, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x25, 0x0a, + 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x52, + 0x03, 0x41, 0x72, 0x72, 0x22, 0x64, 0x0a, 0x0e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x53, + 0x75, 0x62, 0x73, 0x69, 0x64, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x4e, + 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x4e, + 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x47, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x47, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x22, 0x3f, 0x0a, 0x13, 0x44, 0x42, + 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x53, 0x75, 0x62, 0x73, 0x69, 0x64, 0x79, 0x41, 0x72, 0x72, 0x61, + 0x79, 0x12, 0x28, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x53, + 0x75, 0x62, 0x73, 0x69, 0x64, 0x79, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x98, 0x01, 0x0a, 0x0c, + 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x5f, 0x44, 0x72, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, + 0x42, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x42, 0x65, 0x74, 0x12, 0x1c, + 0x0a, 0x09, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x31, 0x12, 0x18, 0x0a, 0x07, - 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x31, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x49, + 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x31, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x61, 0x74, 0x65, 0x31, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x52, 0x61, 0x74, 0x65, 0x31, 0x12, 0x18, 0x0a, 0x07, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x31, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x41, + 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x52, 0x61, 0x74, 0x65, 0x31, 0x12, 0x18, 0x0a, 0x07, + 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x31, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x31, 0x22, 0x3b, 0x0a, 0x11, 0x44, 0x42, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x5f, 0x44, 0x72, 0x6f, 0x70, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x26, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, diff --git a/protocol/server/pbdata.proto b/protocol/server/pbdata.proto index ad5911d..afb8a76 100644 --- a/protocol/server/pbdata.proto +++ b/protocol/server/pbdata.proto @@ -835,6 +835,8 @@ message DB_GameFree { int32 RatioMax = 71; + int32 IsDrop = 72; + } message DB_GameFreeArray { @@ -947,17 +949,15 @@ message DB_Game_Drop { int32 Id = 1; - int32 GameId = 2; + int32 Bet = 2; - int32 Bet = 3; + int32 ItemName1 = 3; - int32 ItemName1 = 4; + int32 ItemId1 = 4; - int32 ItemId1 = 5; + int32 Rate1 = 5; - int32 Rate1 = 6; - - repeated int32 Amount1 = 7; + repeated int32 Amount1 = 6; } diff --git a/srvdata/gamedropmgr.go b/srvdata/gamedropmgr.go index 915270c..b768527 100644 --- a/srvdata/gamedropmgr.go +++ b/srvdata/gamedropmgr.go @@ -8,12 +8,10 @@ func init() { DataMgr.RegisterLoader("DB_Game_Drop.dat", GameDropMgrSingleton) } -var GameDropMgrSingleton = &GameDropMgr{ - GameDropData: make(map[int32][]*GameDropData), -} +var GameDropMgrSingleton = &GameDropMgr{} type GameDropMgr struct { - GameDropData map[int32][]*GameDropData // gameId:[]*GameDropData + GameDropData []*GameDropData } func (this *GameDropMgr) Load(fileFullPath string) error { @@ -40,7 +38,7 @@ func (this *GameDropMgr) ModuleName() string { } func (this *GameDropMgr) Init() { - this.GameDropData = make(map[int32][]*GameDropData) + this.GameDropData = this.GameDropData[:0] if PBDB_Game_DropMgr.Datas == nil { return } @@ -61,18 +59,17 @@ func (this *GameDropMgr) Init() { MinAmount: v.Amount1[0], MaxAmount: v.Amount1[1], } - this.GameDropData[v.GameId] = append(this.GameDropData[v.GameId], gdd1) - } - for _, v := range this.GameDropData { - sort.Slice(v, func(i, j int) bool { - return v[i].BaseCoin < v[j].BaseCoin - }) + this.GameDropData = append(this.GameDropData, gdd1) } + sort.Slice(this.GameDropData, func(i, j int) bool { + return this.GameDropData[i].BaseCoin < this.GameDropData[j].BaseCoin + }) + } -func (this *GameDropMgr) GetDropInfoByBaseScore(gameId, baseCoin int32) []*GameDropData { +func (this *GameDropMgr) GetDropInfoByBaseScore(baseCoin int32) []*GameDropData { var ret []*GameDropData - arr := this.GameDropData[gameId] + arr := this.GameDropData i := sort.Search(len(arr), func(i int) bool { return arr[i].BaseCoin > int64(baseCoin) }) diff --git a/xlsx/DB_GameFree.xlsx b/xlsx/DB_GameFree.xlsx index 08a3f19..5770245 100644 Binary files a/xlsx/DB_GameFree.xlsx and b/xlsx/DB_GameFree.xlsx differ diff --git a/xlsx/DB_GameItem.xlsx b/xlsx/DB_GameItem.xlsx index 23093cf..8f5695b 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 4baa28c..47f4044 100644 Binary files a/xlsx/DB_Game_Drop.xlsx and b/xlsx/DB_Game_Drop.xlsx differ diff --git a/xlsx/DB_Pigbank_Prop.xlsx b/xlsx/DB_Pigbank_Prop.xlsx index 3f4fb10..4d103b5 100644 Binary files a/xlsx/DB_Pigbank_Prop.xlsx and b/xlsx/DB_Pigbank_Prop.xlsx differ