diff --git a/common/constant.go b/common/constant.go index efe6abc..26b1d34 100644 --- a/common/constant.go +++ b/common/constant.go @@ -712,6 +712,7 @@ const ( TaskTypeFirstLogin = 15 // 每日首次登录 TaskTypeInviteNum = 16 // 邀请绑定数量 TaskTypeTurnplate = 17 // 转盘抽奖次数 + TaskTypeInviteRecharge = 18 // 被邀请人充值金额 ) const ( @@ -791,3 +792,7 @@ const ( ) var PetIDs = []int32{PetIDChicken} + +const ( + InviteScoreRecharge = 10000 // 用户每充值$1邀请人获得积分 +) diff --git a/data/DB_Game_Drop.dat b/data/DB_Game_Drop.dat index 93817af..fef8637 100644 --- a/data/DB_Game_Drop.dat +++ b/data/DB_Game_Drop.dat @@ -1,213 +1,209 @@ -(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: +(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: diff --git a/data/DB_Game_Drop.json b/data/DB_Game_Drop.json index 2da5d7a..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 ] }, { diff --git a/data/DB_GiftCard.dat b/data/DB_GiftCard.dat index 1560036..96640b0 100644 Binary files a/data/DB_GiftCard.dat and b/data/DB_GiftCard.dat differ diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index bed563e..f970136 100644 --- a/data/DB_PropExchange.dat +++ b/data/DB_PropExchange.dat @@ -1,5 +1,5 @@ 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 50d1fa8..f737dc0 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/dbproxy/svc/u_invitescore.go b/dbproxy/svc/u_invitescore.go index 927913d..2684de5 100644 --- a/dbproxy/svc/u_invitescore.go +++ b/dbproxy/svc/u_invitescore.go @@ -48,6 +48,7 @@ func (b *BindScoreSvc) GetInviteScore(req *model.InviteScoreReq, ret *model.Invi type M struct { Score int64 + Money int64 } var tc []M @@ -58,6 +59,7 @@ func (b *BindScoreSvc) GetInviteScore(req *model.InviteScoreReq, ret *model.Invi {"$group": bson.M{ "_id": nil, "score": bson.M{"$sum": "$score"}, + "money": bson.M{"$sum": "$money"}, }}, }).AllowDiskUse().All(&tc) if err != nil { @@ -67,6 +69,7 @@ func (b *BindScoreSvc) GetInviteScore(req *model.InviteScoreReq, ret *model.Invi if len(tc) > 0 { ret.Score = tc[0].Score + ret.Money = tc[0].Money c := PlayerDataCollection(req.Platform) if c == nil { return PlayerColError diff --git a/model/invitecode.go b/model/invitecode.go index c99bc8b..598dc9d 100644 --- a/model/invitecode.go +++ b/model/invitecode.go @@ -53,6 +53,7 @@ type InviteScore struct { Tp int32 // 积分类型 common.InviteScoreType~ Score int64 // 积分 Ts int64 // 时间戳 + Money int64 // 充值金额 } type InviteScoreReq struct { @@ -61,16 +62,18 @@ type InviteScoreReq struct { } type InviteScoreRet struct { - Score int64 - ZScore int64 + Score int64 // 包含扣积分 + ZScore int64 // 只包含大于0的积分 + Money int64 // 充值金额 } // GetInviteScore 查询总积分 // 下级玩家所有积分 -func GetInviteScore(plt string, snid int32) (int64, int64, error) { +// 返回 包含扣积分，只包含大于0的积分，充值金额 +func GetInviteScore(plt string, snid int32) (int64, int64, int64, error) { if rpcCli == nil { logger.Logger.Warnf("rpcCli is nil") - return 0, 0, errors.New("rpcCli is nil") + return 0, 0, 0, errors.New("rpcCli is nil") } req := &InviteScoreReq{ @@ -81,10 +84,10 @@ func GetInviteScore(plt string, snid int32) (int64, int64, error) { err := rpcCli.CallWithTimeout("BindScoreSvc.GetInviteScore", req, ret, time.Second*30) if err != nil { logger.Logger.Warnf("GetInviteScore err:%v", err) - return 0, 0, err + return 0, 0, 0, err } - return ret.Score, ret.ZScore, err + return ret.Score, ret.ZScore, ret.Money, err } // SaveInviteScore 保存积分变更记录 diff --git a/worldsrv/action_welfare.go b/worldsrv/action_welfare.go index 89b2c88..abe2225 100644 --- a/worldsrv/action_welfare.go +++ b/worldsrv/action_welfare.go @@ -313,28 +313,25 @@ func CSInviteInfo(s *netlib.Session, packetid int, data interface{}, sid int64) res, err = webapi.ApiGetInviteLink(common.GetAppId(), req) return nil }), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) { + info := webapi_proto.SAPlayerInviteLink{} + link := "" if err != nil || res == nil { logger.Logger.Errorf("ApiGetInviteLink err %v or not return", err) - return - } - - var info webapi_proto.SAPlayerInviteLink - proto.Unmarshal(res, &info) - - if info.Tag == webapi_proto.TagCode_SUCCESS { - ret := &welfare.SCInviteInfo{ - Num: p.InviteNum, - Code: p.InviteCode, - InviteUrl: info.Link, - Score: p.InviteScore, - OtherCode: p.OtherCode, - } - - p.SendToClient(int(welfare.SPacketID_PACKET_SCInviteInfo), ret) - logger.Logger.Tracef("SCInviteInfo %v", ret) } else { - logger.Logger.Errorf("ApiGetInviteLink:%v", info.String()) + proto.Unmarshal(res, &info) + logger.Logger.Infof("ApiGetInviteLink info %v", info.String()) + link = info.Link } + + ret := &welfare.SCInviteInfo{ + Num: p.InviteNum, + Code: p.InviteCode, + InviteUrl: link, + Score: p.InviteScore, + OtherCode: p.OtherCode, + } + p.SendToClient(int(welfare.SPacketID_PACKET_SCInviteInfo), ret) + logger.Logger.Tracef("SCInviteInfo %v", ret) })).Start() return nil } diff --git a/worldsrv/invitecode.go b/worldsrv/invitecode.go index 9d17ecd..74eb10f 100644 --- a/worldsrv/invitecode.go +++ b/worldsrv/invitecode.go @@ -30,20 +30,29 @@ func SaveInviteScore(data *model.InviteScore) { return nil }), task.CompleteNotifyWrapper(func(i interface{}, t task.Task) { p := PlayerMgrSington.GetPlayerBySnId(data.InviteSnId) - if err == nil && p != nil && data.Score != 0 { - if data.Score < 0 { - if -data.Score > p.InviteScore { - data.Score = -p.InviteScore + if err == nil && p != nil { + if data.Score != 0 { + if data.Score < 0 { + if -data.Score > p.InviteScore { + data.Score = -p.InviteScore + } + } + p.InviteScore += data.Score + p.dirty = true + + // 更新邀请任务进度 + if data.Score > 0 { + TaskSubjectSingleton.Touch(common.TaskTypeInviteScore, &TaskData{ + SnId: p.SnId, + Num: data.Score, + }) } } - p.InviteScore += data.Score - p.dirty = true - // 更新邀请任务进度 - if data.Score > 0 { - TaskSubjectSingleton.Touch(common.TaskTypeInviteScore, &TaskData{ + if data.Money > 0 { + TaskSubjectSingleton.Touch(common.TaskTypeInviteRecharge, &TaskData{ SnId: p.SnId, - Num: data.Score, + Num: data.Money, }) } } @@ -51,10 +60,10 @@ func SaveInviteScore(data *model.InviteScore) { } func GetInviteScore(platform string, snid int32) { - var n, z int64 + var n, z, money int64 var err error task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} { - n, z, err = model.GetInviteScore(platform, snid) + n, z, money, err = model.GetInviteScore(platform, snid) if err != nil { logger.Logger.Errorf("GetInviteScore error:%v", err) return err @@ -72,6 +81,12 @@ func GetInviteScore(platform string, snid int32) { SnId: p.SnId, Num: z, }) + + p.ResetTaskN(common.TaskTypeInviteRecharge) + TaskSubjectSingleton.Touch(common.TaskTypeInviteRecharge, &TaskData{ + SnId: p.SnId, + Num: money, + }) } })).StartByFixExecutor(fmt.Sprintf("invite_score_%v", snid)) } diff --git a/worldsrv/player.go b/worldsrv/player.go index 42ff50c..d42d8b1 100644 --- a/worldsrv/player.go +++ b/worldsrv/player.go @@ -4431,8 +4431,9 @@ func (this *Player) InviteTask(scoreType int32, gameId int32, n int64) { SnId: this.SnId, InviteSnId: this.InviteSnId, Tp: scoreType, - Score: a * 10000, + Score: a * common.InviteScoreRecharge, Ts: time.Now().UnixNano(), + Money: n, }) case common.InviteScoreTypeGameTimes: diff --git a/worldsrv/taskmgr.go b/worldsrv/taskmgr.go index fab15fb..0ef1159 100644 --- a/worldsrv/taskmgr.go +++ b/worldsrv/taskmgr.go @@ -245,4 +245,5 @@ func init() { TaskSubjectSingleton.Attach(common.TaskTypeFirstLogin, taskHandle) TaskSubjectSingleton.Attach(common.TaskTypeInviteNum, taskHandle) TaskSubjectSingleton.Attach(common.TaskTypeTurnplate, taskHandle) + TaskSubjectSingleton.Attach(common.TaskTypeInviteRecharge, taskHandle) } diff --git a/xlsx/DB_Game_Drop.xlsx b/xlsx/DB_Game_Drop.xlsx index 55883fa..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