From 4da55c95880b3525a8597bc6c5a22008edf0073f Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Fri, 6 Sep 2024 18:33:28 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E4=B8=AD=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=AE=9E=E6=97=B6=E9=87=91=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/action_server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worldsrv/action_server.go b/worldsrv/action_server.go index bf0779f..441578d 100644 --- a/worldsrv/action_server.go +++ b/worldsrv/action_server.go @@ -513,7 +513,7 @@ func init() { } } - if !scene.IsMatchScene() { // 比赛没金币是积分 + if !scene.IsMatchScene() && !scene.IsCustom() { // 比赛没金币是积分 player.Coin = playerBet.GetCoin() player.GameCoinTs = playerBet.GetGameCoinTs() player.GameTax += playerBet.GetTax() From 1cc5d4f226fcce431d695ea1a0fc5cb5586f3242 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Sat, 7 Sep 2024 09:19:51 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B0=B4=E6=B1=A0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/DB_GameCoinPool.dat | 7 ++++++- data/DB_GameCoinPool.json | 40 ++++++++++++++++++++++++++++++++++++++ data/DB_PropExchange.dat | Bin 384 -> 384 bytes data/DB_Task.dat | Bin 5299 -> 5299 bytes xlsx/DB_GameCoinPool.xlsx | Bin 19300 -> 19697 bytes 5 files changed, 46 insertions(+), 1 deletion(-) diff --git a/data/DB_GameCoinPool.dat b/data/DB_GameCoinPool.dat index a46923a..ec0000c 100644 --- a/data/DB_GameCoinPool.dat +++ b/data/DB_GameCoinPool.dat @@ -102,4 +102,9 @@  X`݌  _X` Ɔw X` - ʵ ֹX` \ No newline at end of file + ʵ ֹX` + X`݌ +̼ _X` +ᚽƆw X` + ʵ ֹX` + ʵ ֹX` \ No newline at end of file diff --git a/data/DB_GameCoinPool.json b/data/DB_GameCoinPool.json index cd94de1..f0185fe 100644 --- a/data/DB_GameCoinPool.json +++ b/data/DB_GameCoinPool.json @@ -1065,6 +1065,46 @@ "UpperLimit": 2000000000, "CtrlRate": 200, "InitNovicValue": 650000000 + }, + { + "Id": 3080001, + "InitValue": 6000000, + "LowerLimit": 5000000, + "UpperLimit": 20000000, + "CtrlRate": 200, + "InitNovicValue": 6500000 + }, + { + "Id": 3090001, + "InitValue": 60000000, + "LowerLimit": 50000000, + "UpperLimit": 200000000, + "CtrlRate": 200, + "InitNovicValue": 65000000 + }, + { + "Id": 3100001, + "InitValue": 300000000, + "LowerLimit": 250000000, + "UpperLimit": 1000000000, + "CtrlRate": 200, + "InitNovicValue": 325000000 + }, + { + "Id": 3110001, + "InitValue": 600000000, + "LowerLimit": 500000000, + "UpperLimit": 2000000000, + "CtrlRate": 200, + "InitNovicValue": 650000000 + }, + { + "Id": 3120001, + "InitValue": 600000000, + "LowerLimit": 500000000, + "UpperLimit": 2000000000, + "CtrlRate": 200, + "InitNovicValue": 650000000 } ] } \ No newline at end of file diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 79f8787d87dd629e44daad01b4faae3b91f55cf3..df991383b8fe9fa879d3427529b95853ef562c82 100644 GIT binary patch literal 384 zcmd-w<6snElw#w!+Qtl~uR-bSQ2H{Iz5=3^I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwf4%!R23s{`5(vlnI_%p4T^VeVAo1iPbQ?IRYhSPmAjL+(H=h8YC20Om26 Z#po8m9Drhx5;IUweP#ew#rtH){|P#w&C6!$4{g5A-u_7MwLEC&nNAuxx+42D?*(+INw>=7h` ZVGh0nbvQTxl-M~I0X_PKnTvt85CCSnJT(9S diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 7f781343a7cc7a11712f89c0ca1f3edb0dfa161a..9f7b037362a28384b6bc206eae7f788ccc486ad4 100644 GIT binary patch delta 236 zcmdn2xmk09p&%Q_l3q3eRxb{Yg+O}2A-RoCv5Zhr5twK%+vW|7_KcHDI7B8hGZ##L z&m=avlX(YF*~KoP3=}fRSl38=ECi!6GEn8#=2d2e2KP{Fz&1 zvj%%K6HuYZ|Cg0`M1)485S%K>(NPM#{H`pD>`hl*SJe#L$@^U`G&1SrM mjFX!=1t*vCy@guC40XqY6lCLA1T=}s3u5+x7Td{eY?e^P4V_g$#UOds z$pLIf(ACc3*{sSQ$22*GPjK=SPSeTDf%Gj-1E9?!ljXR6gTyy$aVIcNzQQFkc^*$Y sRKEz+E}-d~&3N?~Ctv3goLtKH7Ha8( zg)`WS)!Wg*FJ4)tlN~4cQf`svM6}}5#Du;r z=k*>Jt3`|Yo7dIswrmJchxjeJH8e0vlDakq(8@&NtLrA;Wcb{f5@pWGypuBigmxn@ z_3cT^lX~Z!&V3+!S4Qb2M*}mOm3y1bJS`=>Px{T7=EjPeA|et#%+qLap(^Xh;;p5( zjgXg!G{C50Cp&)cQQ(7ApU7|wYZ-;3>})kPC4NRzGVc<)qei^DVAsPE=BM@cNJ^@e z-fh3-cm3B^Pa6hOSNQ|l3B_{LYqM|fBLxMyg ziJeBic;P#qyu-!!0gH))qCK!eo3@B z8`Fdm5d8i7?CiX^v$NNWsxHf!%48W>djGjE^d@w)PW3DcyOl!pz2Dq&%Zkz2)#Tdo z`1sY@_CgaIYQ|b`s2_L{`0aA()YJ%E_HG{})2p16-?`sN-vPJYm*?tLchEcIt7Wmp z_g_Yf?rapvrVdAst=2Ph6iI8gf5DN22?eF8{ZgW@hI11o&#cRPiX1KN0yYcQ^tTwCm zD6{rx*Gj;fqXnsTdF4SgaCXX_8?*v%F|y#L>IFD`tIZOVw^fgr9aiY&$6`_si#*N1~gv3l)s4?{lNhct0Mu;)*Mu`RsW3<<5w$ zkT;9oLYD8mB$*S5O`yl|Obg``A!!x?0?TjLiNiv)-6@`0K5cusi91R+<{ z$eaG_L@c<-%aF-?nR9a$x^#1CkQq&>XvGh(CI)D#6_Q1E9Pi@ZaZvd(pxtTTI2ans zM8!2c1C=P0-G2{W#g43?Y7*nm6>Q@yieXTyA>478rBDc7vqx*KT!Zhh0FF6pw6y=s z*^T2Ffr5q_@#j!sP2oe4%r`j#$gg-cdo*I@yW!o;Lsk@0^f-{xpE=r_pqjEwB<*pH z=n*nkVVYUn`n#BtKo75Gq33P0zy%wZS4|Hr7MUJ*v;~dBF%z>$! z^H*IwfxFIWIu{(sUYNX0{t)l@}%{Ck$!6?UQ1G> zXq9iJm_sO7i{Ut&(3gZy?r6`4{*zrRn6OXzeho1*JYgw{fcUMcjbH~7^9n=^&rFd?&` z<Dbo#0&539gI)1N*lAkCWn|h<0#-Ps1AnjAwRvjiTMX}Wn zb0)`{euGwnI}61oPD}#rs&U%W3u^5VROV5#O|aY~>%_jD?``GK_Y*YE$bdwULV_Z? z`m&b&5&77Y%3g!o+!|H}%{?5i5tL?i(J>kc?lE{kuJkk&gXQG@dce0`;A1ZvNsR2W z#V77gw>POEN2izm#c1G2w_w7xpX6VlHgRG*1yZb?e@K}3dnha3?3NT7;Nau$>&M-N z>q5c{M!mK#$o7O&X)VN$kvj6J6hQ6cMRa4hqyZ^-%4^ZIDiFPjdpaJjE$C8{|0UnJ z2^i*MBG$0a)A#}A`Y5E0XiU`~f;8R-GF9OnE*wo777(vB$Ro;sE9^=uq8#H`DFcU<5-9p9rcLp6(XOD?^MPnZQcjh*F01?=gQCT1i`Vqd zVKPW4&`x{)Q%f1Q=DLA~OLgH!?RQTgrC`A zB9JvK{OvI^hdR5#sif<;mPzo%!Q$cIFy8aUw0(9}hH38EF9V{;aRyAujLBtrU&zq0Yr23dqbkMs8IOcUciYuk6XYAQT=poCP_yDQ^ zxBBh5w&1WEG+l}wt%+{kyaWRBW=;G|VI?BLH@#XUY4IFlo;Uux_yzIZnw~7{+g%){ z1d2tDkcJs_D-+80dM<8LVK6gxk~0pz+feL5*T*ZJo z+saj1Bio3s3d6zi z8NaL34k~Z;Qf!BjNkc2;D<<&6K@B?GdvX_6Wc3jO!yMK;7>RZv^$_kI>-csBXT0TA zYs7j?G9-;*-|G|MVQ}E2U2XBPh1rgUYSb1&beeKRV!j;rU`uw1_`knzjW{w&q zAL-KiLUyKfFiyFF^Mw{dKL!0C;3F;Gu1`f0N1d~>l{6C7&k?B;mD94CXV=NAho~qh z*m@iz-*B?UU`$TAd^!C$D3%a9zSu7b8tLPTq4MaPJ=~U>m~N#!M6DZ6Y0W+S&D!2~ z{>Ob4XMxV_Eo~`gv?N=eI=*9)>8IBFB^%rY9{YgKQgABRFneh*kjln`dAy55x)=2& zz^)kjh7m+*lJyuGt)e$?yItvR+xBROW2q;G+A=_*em!Q<|irypeuF9PP^t$ag^o=6AGcM*8-_%~x#eGt z1skWg8rP}vqo(jGZdqC7D@i?al;PPVxD<0IpPDR)V#`)S>Vm=6YOq=J2aZ?KpVWe- zx5Rl8rd#FJ&gS3pU{74KDQ}iyoR~sA34*iHu&hWk~RjG%gA&TL%ZI6g^P|D8=zoLAhJJ5=4I{Et3+^ zP?$KPbWz8M%3P|g`vK$eWM5puR~6{v;mpeUqWLnw@jH-kR`pbPdvp= z)h8NP{hCFXZzsYdbLciSf7#NGzNEljs1+7iHPTdLmC`zb)swR3-jv4 ztv!Dgh@cv@nv)9=D0R=Ncu?DfVlP!3h7=XI1=~iETrZKs|`HqaKM!7B2;gy(m6grVax1ZUqxokWNQha6>iPUxioh*CWe8Yp}yjg)7nd&_aqWQ>ql0 zX6{M{p2*ox6RuTtD7|?~t^2_~f9$brz?A03aQnwx}GK`@2UaSe)#MZ|t`V?zYy3bH+z>Qt5_g-1^i*}R)TDKoLk)R|QFluxwy50U!RQ#HlNNKfG3iw z-_ltX5v>OphsjD2!6%#18Udds2YZRD*5Q_~YNcg7S!#C*Afw8yhIT{ofSF&QS!Inzp~EhI@24Wz z+;1rr_|*k5c3?{i+dPY-a&t8|@qlnHI5i$7A>bbgn(x%ryiiR4Z2&Eso`ud~vMsnS z&O<2gVy{HE@d~Z4lE~TX4;q^|@mgs6N}HJQuV%jf9!Z|0h<}WRdYNH9IaFm1@IMxB zfc4y`2!&u#d7n)12yC7N-+pJ;96;=2>9x;SYshsuUsPU6>(z1pe+{w{+P#=CDCjSA zc>lXF+fc#@9Ju%_jX{f*!B@MEQAoMVMst?s$2RN%!ArGNO1K>BxKHqr15E>fh+OF; z?%;BIxtlPHS=M7sRLUltQc*YBGD zvOlbc6OrrPH#b4QA1g)V)73f$jqjBB->XLu;-9}0$e4x$?;WNwR1Yvr+0|zMBZpYu zfGLqqKT#!5hlcWvOj|P%*=~D=wxG_VhzXbogd3O}V6B^_9P*ij6wqSsqOCwfGJkAa z^sG0LiO^J?5(9Z6kb(o;Rib-`Pc}f{~T6 z`wv-@9?6QC_~Y1?>gc6joh9o~!UEih;ub=%lR(kGY`+&qEHzlusKdctloSR>K6a|O z%#nt??vs0`CtD2FjUM*U4yA^t)UCX%YCB0^e%3Nn8?$EPSpu2yI^X;Yjl+Zlf|g%V zHNtYF5p!raZ+hhZ?Nv!0=8`M%+|eOFo6?ur`!)}xs~XpS{GXd&f0j-Y%D97>);Rwm zcMapGb#GIG_3><(HdvRz1_33;zN35=(Jn$Zvc;Z`hN(}AaW`gq2qH=pv`S|LBcBUy z{EMxMaNV|S^ERD^gT>fipx7O)@=~vP6%UX250IglPCa;Wz8-{L3P!J)$JgT?mnVhS zEF0xls?%X6V7eO!VKRQKFcP@1NzQyX!vd)AeFY$xAI$&GVW0j{$kOrWWc2P6KP`vS zGN*_{VaYAitiYMlML`b?SH6uuqhLcYQk((G*5ZU&&%M*t2IAs;&9RJG{vt}O0oh|| zQThC@vyGiz{in2`I?+%z{4rT|dvPMQ7Y6l5dV~W17dBmTZxcaK;sUHFKM!+xuF|>W zVn4~*YuMz9G(H9^jcgPS``?mPB_fu0_&SX6A6bq48mXbiHCVFQmulLem?dK8FQbWH z!k7pnqU&Q#wi$cA%IT1c>ZY?RX8{!Z-oxuG&BNwz0LH{`(HQvpn_u-yH}PcLiQ4|# zI-Ou`$lH=2pp6j`hO2(WaU=Z2{STPqz{|89RyZYC<78jbuh1%4WF^2jmSaW;&_jVW zAda4U^Q$4muErWyv-~cUSQ9d$SNMbK1h6umWgY+wwckJghm>BRe?2^oG}xA5Ab2ph z!a^18Z&1hkm(BLj|IOxqf&XDMjLh|Z=OVIdw2PDy(UJ5`yk$cl7SO=BHyenXP#+b4To4B|jLu43$;MG^D%j3NRqLaGcu9r6oUJuFBtH+y#C4>EA%Nif+obtpY|**8wjF-ye8l`6>91^KYw55Ty^WqMvt?E; zEPPX(E$`jQzPGbI<4;yedUeZIV=}(hIdqzQ8o70~khqufp?Vxt@7oy!0Qc|~!euY8 zMS;_bWrSP=%qe&+OyVLoE$y~uVUe*U`(Dhl%@F-($mD9s=l47Ql#5Y_0@gOh|WCJdbCw}?I7hVqoY_glk$7_sQ=YN%=y$eSel zh8Mv_==I458Gxw)ir4hhniuH&+30p`pWJskp37w`edj)$XCUtP{VF- zdqHI7P+L)X=t+e3)7s6(Tn*4;1mbO0+x9cW$;L>qzsop^)C)+&F<@sNyCHCam{aI) zFSHdC+fBb>eHA3doFP)mI{vTX>j40w75^00s(1F%MilC@^U02&Kt#*Rb>j1AR4z~% zLeJ=v3{(+Q3Lhq)6m^U~_cnY~v~%Pll(UO@@IlJI#@l5tQf5BTIdp#Uo0l7VneBJ) zsq(6?>okT~h#oCyw6%p_m;v#>0Z$P9Rb$`a$r5DW@EJ(b3qaD6XciMpSzdfM zT|Tms$S1c+8-N*dQXb^40>}6X&wpV1L!kE4#c`0G=g_|qZV*_D=MA5%v3W71SMDY$ z@smrGs|=>}@RN>|3bhq#63oVL6k^^am?1x@bt#^r>|yAL*t~UY_(#IAY3(pjgUC+_ zx*Se!T%$O01LNPl-V5ZWj4CencXbP7-}yYHQPH+!_L_xyQX=ywTw#mab=z#&=6ub+ zR2_@Za*9E)dB@L%<6dBZTrUsvJv==0B{FCWT|;pbxiIe~dc65G?6qr4^&f+ix&r@F z?m!GiIV?bXM8XrX9Y1|D@3|(WFq9qzRKNW;%q}Kmd0;7J;nZKF-+{U5Q^z_# zKYtg~h}C~Ip}%>6X#kZ-B>*&m+QK?(J6K~6kQfgB!#)Lib+`juYouSS8eaBLYfohP zM^h}M%UDz6XqaP4eLSQk6cb&YD4kIoU`D;1v~FP~vV+O^D}wN1fyZQm(7h+f$!kyC zNnlG+FrC=R9K{0%E}{Wcm2~>_&4lY-Fd#JExRCx2uB;sw{P{xhYz#8!p_Z@G!d1rSC@8wi>0tYd;D~hx6G-m zXro8dKJ2J?U0!L@vdD}|-s_8|wxQx=dN^7^Oi@bH`O{2gp0{>%Shw z57>OJHm`}DXD^fs)riJgkQQ{n+bvhl4SJ`1$%yScyJo_j6ZGXnH1@py$kpl+{qJ9H zase;>khIuC*}Jotv!wKk9C!wLr`|N@z1+g-CZ($lPndhDVV*80Uwbsuw@)tFG%7&< zT>_c@Jr=`QE+p*44Na5(^$;K=>n5kTOU;2_TCHCc^(<(dUA@E=W_Gya^G6?8lDS6j zuopJ7LqA;P;I*EzUq72z54-$k#V5IqX)znUfa&9kg9Oc4U6)(%j0k5LCN{899xYY0v;G%YgCF-)%%8Kxg zYLHMC+3rKC^2;X}U&Vws@XfEAWgs;0aVIZw&FqaXCp^ z|G)xrz1Z^nphK^|7#(;iLhimh2zc=;|w+a z`5|JT;)axoHPBbALe6E(8QqcyrslDHdsP@|tsQgr&Ii&f9H*ox+5&$?zTVoZK|Tm* z_3DbAtzPemIqD|($|%66i2sa8Er36NtE)zfwJh&t7Xy$#`nJ^1u|@bOT`r?Jw#yYS zLJ^xZ%!$d0U@-6G*D=)drn=Fu(eLzn@4$H>9rn5Rutm7#clDikFQ+V zN#yerJ^fcGDGVQ;vH6N}2qUkT%=Od5RrkGM>w04;g07yGf&)i}TL341obs)yxOkSx zTA{16JGr##ttkH4jh*7KRo~}22PFia z`J18k&?{_l;;nV^9Q-KyXQdd+asZ+R(}B&4=Z&>GUS;FBo;@|$%VgT`6>U#u5ybjG za}Z8f3B_O1(!36qnwc{`o;0kV-Y-w;Y~Z@-3NLyl5PJINOU@h#tL?@tR&c+GD_u~H zwr}}I>tZZhiXFSHx3sDjwnVQZdi54OIHsnnKO3!G8}uK3uZXW+;ANDvB}@jGsw0Mi zC~G2gC|~$VBxr*5#@M)wGmP3!;?Gy-ST*0UPo8ca1x|m})rBN*R_4cQ<;O(`4&tDi zVv0kBLy4w8dVNm5*icT62cb5;HMJqICp%bu3oKErc3PdBbUi#r9+Zn z+R7>=s=VgP=#LI%7dCqRW(Px7qV?4WqCXedy++6kez&>C>^Jjj_$;KHmb%g!3q7km zk#Fr2<*x?@=NC>x0!6pq$wD7ksMJylR)&ked-zi<=#=eDvpFs3jQj+)<=s5TGnk0G z9Sc|$RYpsjVqzk(YI9?uct%EC)gnS%ysY8hRV?d_?Wi(JpY`XKDHa)7`w6|`YcOmt z+9x%goEu&{$xmE5sE5Nz(&^cChs+nakk&pcFrr1wS=~ z4F?74g_%1zvuLWWqz|Bp8Ng&sa$VeoFQ2Ualf-2viEY&#<=f-%06}X4OL=qz$4w<` zGGwaF!$T6JirUwgBRPS%PinglhPR%+8$Nzk^NAkUh?&7A^)50&tA^i3Aw!l-s0Jfw z>y;F3a~T%UD3MyQ3&C{5e#I)>z5EL8-6>iQxu4Sg!oswN?pks2M@0RWXEfoxqFB@l z6r`5Ot%BiE)Zco=N=R3J`fq)bT0G1!H#QDzFu@CflCAj=KoTZXSvWTAIei;kvI*lx z$qSzK7ed(DEgvx5=A*v3XkrhKwlZH6Sa$>tn!@-$=tsLCg zSRe0@ad}3_4_SjJ|5-+Zh{*AhKW;|R!&cL|NlS6Gf>I^ delta 9650 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 ZAD=B~|6XC?MnQRs_>&C-S?T`!{|EK`YS;h( From cb4b51b4aa8e82b6d94e1f425fe28df3898e869d Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Sat, 7 Sep 2024 10:03:50 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E9=A6=86=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/tienlen/scenedata_tienlen.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gamesrv/tienlen/scenedata_tienlen.go b/gamesrv/tienlen/scenedata_tienlen.go index e581d75..62c1ee3 100644 --- a/gamesrv/tienlen/scenedata_tienlen.go +++ b/gamesrv/tienlen/scenedata_tienlen.go @@ -2117,15 +2117,16 @@ func (this *TienLenSceneData) SaveCustomLog() { Platform: this.Platform, CycleId: this.CycleID, RoomConfigId: this.GetCustom().GetRoomConfigId(), + GameFreeId: this.GetGameFreeId(), + TotalRound: this.TotalOfGames, + PlayerNum: this.PlayerNum, + Password: this.GetCustom().GetPassword(), + CostType: this.GetCustom().GetCostType(), + Voice: this.GetCustom().GetVoice(), RoomId: this.SceneId, StartTs: this.GameStartTime.Unix(), EndTs: time.Now().Unix(), State: state, - GameFreeId: this.GetGameFreeId(), - TotalRound: this.TotalOfGames, - Password: this.GetCustom().GetPassword(), - CostType: this.GetCustom().GetCostType(), - Voice: this.GetCustom().GetVoice(), } for snid := range this.BilledList { var items []*model.Item From 9b5dff5f96cd2efc5b0ff532b1b46a704a01d6cb Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 7 Sep 2024 10:22:55 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=B8=8A=E5=88=86=E4=B8=8D=E8=B5=B0?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=9A=8A=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- machine/action/action_server.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/machine/action/action_server.go b/machine/action/action_server.go index ea70d6b..520fbfe 100644 --- a/machine/action/action_server.go +++ b/machine/action/action_server.go @@ -71,7 +71,7 @@ func processConnMessageQueue(queue *ConnMessageQueue) { // 移动 func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data interface{}) error { - logger.Logger.Tracef("SMDollMachinePerateHandler %v", data) + fmt.Println("SMDollMachinePerateHandler %v", data) msg, ok := data.(*machine.SMDollMachineoPerate) if !ok { return nil @@ -121,13 +121,14 @@ func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data inte Process(conn, f1, f2) case 5: //投币 - f1 := []func(){ - func() { machinedoll.Coin(conn) }, - } - f2 := []func(){ - func() {}, - } - Process(conn, f1, f2) + /* f1 := []func(){ + func() { machinedoll.Coin(conn) }, + } + f2 := []func(){ + func() {}, + } + Process(conn, f1, f2)*/ + machinedoll.Coin(conn) go DollMachineGrabResult(session, conn, msg.Snid, msg.GetId()) } return nil From 759c98971975909a80a1dcb293b0b7dabcfcc478 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 7 Sep 2024 10:43:36 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E8=8E=B7=E5=8F=96token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/clawdoll/action_clawdoll.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gamesrv/clawdoll/action_clawdoll.go b/gamesrv/clawdoll/action_clawdoll.go index e77acb9..0abe0a0 100644 --- a/gamesrv/clawdoll/action_clawdoll.go +++ b/gamesrv/clawdoll/action_clawdoll.go @@ -9,6 +9,7 @@ import ( "mongo.games.com/game/protocol/machine" "mongo.games.com/goserver/core/logger" "mongo.games.com/goserver/core/netlib" + "strconv" ) type CSPlayerOpPacketFactory struct { @@ -136,7 +137,7 @@ func (h *CSGetTokenHandler) Process(s *netlib.Session, packetid int, data interf logger.Logger.Tracef("获取娃娃机 appId = %v, serverSecret = %v, streamId = %v", machineInfo.AppId, machineInfo.ServerSecret, machineInfo.StreamId) //生成token - token, err := token04.GenerateToken04(uint32(machineInfo.AppId), string(p.SnId), machineInfo.ServerSecret, 7200, "") + token, err := token04.GenerateToken04(uint32(machineInfo.AppId), strconv.Itoa(int(p.SnId)), machineInfo.ServerSecret, 7200, "") if err != nil { logger.Logger.Error(err) return err From 1b67a44d6375a8c87e3e005f4cce797a1d618cde Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Sat, 7 Sep 2024 10:46:34 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E9=A6=86=E7=89=8C?= =?UTF-8?q?=E5=B1=80=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/action/action_game.go | 7 +++++++ gamesrv/tienlen/scenedata_tienlen.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gamesrv/action/action_game.go b/gamesrv/action/action_game.go index 8148257..761309f 100644 --- a/gamesrv/action/action_game.go +++ b/gamesrv/action/action_game.go @@ -291,6 +291,13 @@ func CSDestroyRoom(s *netlib.Session, packetid int, data interface{}, sid int64) send() return nil } + if scene.ExtraData != nil { + gs, ok := scene.ExtraData.(base.GameScene) + if ok { + gs.SceneDestroy(true) + return nil + } + } scene.Destroy(true) return nil } diff --git a/gamesrv/tienlen/scenedata_tienlen.go b/gamesrv/tienlen/scenedata_tienlen.go index 62c1ee3..0269621 100644 --- a/gamesrv/tienlen/scenedata_tienlen.go +++ b/gamesrv/tienlen/scenedata_tienlen.go @@ -2105,7 +2105,7 @@ func (this *TienLenSceneData) SendFirstGiveTimeItem(p *base.Player) { // SaveCustomLog 保存竞技馆对局记录 func (this *TienLenSceneData) SaveCustomLog() { - if this.CustomLogSave || !this.IsCustom() { + if this.CustomLogSave || !this.IsCustom() || this.NumOfGames == 0 { return } this.CustomLogSave = true From 59eb4ecc22abc56c675becf67af76650689b72fc Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 7 Sep 2024 11:17:33 +0800 Subject: [PATCH 07/13] token --- gamesrv/clawdoll/action_clawdoll.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamesrv/clawdoll/action_clawdoll.go b/gamesrv/clawdoll/action_clawdoll.go index 0abe0a0..2971bec 100644 --- a/gamesrv/clawdoll/action_clawdoll.go +++ b/gamesrv/clawdoll/action_clawdoll.go @@ -134,7 +134,7 @@ func (h *CSGetTokenHandler) Process(s *netlib.Session, packetid int, data interf return nil } - logger.Logger.Tracef("获取娃娃机 appId = %v, serverSecret = %v, streamId = %v", machineInfo.AppId, machineInfo.ServerSecret, machineInfo.StreamId) + logger.Logger.Tracef("获取娃娃机 appId = %v, serverSecret = %v, streamId = %v,snid = %d", machineInfo.AppId, machineInfo.ServerSecret, machineInfo.StreamId, p.SnId) //生成token token, err := token04.GenerateToken04(uint32(machineInfo.AppId), strconv.Itoa(int(p.SnId)), machineInfo.ServerSecret, 7200, "") From d34473c6887bd5297d9aee5156b1aeb79976a785 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 7 Sep 2024 11:40:04 +0800 Subject: [PATCH 08/13] token --- gamesrv/clawdoll/action_clawdoll.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gamesrv/clawdoll/action_clawdoll.go b/gamesrv/clawdoll/action_clawdoll.go index 2971bec..0f785fb 100644 --- a/gamesrv/clawdoll/action_clawdoll.go +++ b/gamesrv/clawdoll/action_clawdoll.go @@ -142,7 +142,7 @@ func (h *CSGetTokenHandler) Process(s *netlib.Session, packetid int, data interf logger.Logger.Error(err) return err } - logger.Logger.Trace(token) + logger.Logger.Trace("======================token========================", token) pack := &clawdoll.SCCLAWDOLLSendToken{ LogicId: scene.DBGameFree.GetId(), From 83d5ec05fb6be3207d8f299cb410e574f770425a Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 7 Sep 2024 14:04:44 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E7=94=9F=E6=88=90token=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/clawdoll/scenepolicy_clawdoll.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gamesrv/clawdoll/scenepolicy_clawdoll.go b/gamesrv/clawdoll/scenepolicy_clawdoll.go index f60bbfa..d31e214 100644 --- a/gamesrv/clawdoll/scenepolicy_clawdoll.go +++ b/gamesrv/clawdoll/scenepolicy_clawdoll.go @@ -4,6 +4,7 @@ import ( "github.com/zegoim/zego_server_assistant/token/go/src/token04" "mongo.games.com/game/gamesrv/action" "mongo.games.com/game/protocol/clawdoll" + "strconv" "time" "mongo.games.com/goserver/core" @@ -290,7 +291,7 @@ func (this *PolicyClawdoll) SendGetVideoToken(s *base.Scene, p *base.Player, sce logger.Logger.Tracef("获取娃娃机 appId = %v, serverSecret = %v, streamId = %v", machineinfo.AppId, machineinfo.ServerSecret, machineinfo.StreamId) //生成token - token, err := token04.GenerateToken04(uint32(machineinfo.AppId), string(p.SnId), machineinfo.ServerSecret, 3600, "") + token, err := token04.GenerateToken04(uint32(machineinfo.AppId), strconv.Itoa(int(p.SnId)), machineinfo.ServerSecret, 3600, "") if err != nil { logger.Logger.Error(err) return From 8174e6c406f44ae971f091d036b6e728888e9659 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Sat, 7 Sep 2024 14:15:56 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=95=86=E5=BA=97=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/shopmgr.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/worldsrv/shopmgr.go b/worldsrv/shopmgr.go index 75333b9..e01fe96 100644 --- a/worldsrv/shopmgr.go +++ b/worldsrv/shopmgr.go @@ -1226,6 +1226,13 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any, } + switch shopInfo.Page { + case ShopPageFangKa: + remark = fmt.Sprintf("房卡|%v", shopInfo.Id) + default: + + } + dbShop = this.NewDbShop(p, shopInfo.Page, amount[:], ShopConsumeMoney, costNum, common.GainWay_ShopBuy, itemInfo, shopInfo.Id, shopInfo.Name, 0, remark, []int32{}) err := model.InsertDbShopLog(dbShop) From 1d98a31bf45c477e90389a04df42b5b66e31da1a Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 7 Sep 2024 14:29:34 +0800 Subject: [PATCH 11/13] =?UTF-8?q?token=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/clawdoll/action_clawdoll.go | 92 ----------- machine/action/action_server.go | 8 +- protocol/machine/machine.pb.go | 235 +++------------------------- protocol/machine/machine.proto | 14 -- 4 files changed, 28 insertions(+), 321 deletions(-) diff --git a/gamesrv/clawdoll/action_clawdoll.go b/gamesrv/clawdoll/action_clawdoll.go index 0f785fb..8e67d2d 100644 --- a/gamesrv/clawdoll/action_clawdoll.go +++ b/gamesrv/clawdoll/action_clawdoll.go @@ -1,7 +1,6 @@ package clawdoll import ( - "github.com/zegoim/zego_server_assistant/token/go/src/token04" "mongo.games.com/game/common" rule "mongo.games.com/game/gamerule/clawdoll" "mongo.games.com/game/gamesrv/base" @@ -9,7 +8,6 @@ import ( "mongo.games.com/game/protocol/machine" "mongo.games.com/goserver/core/logger" "mongo.games.com/goserver/core/netlib" - "strconv" ) type CSPlayerOpPacketFactory struct { @@ -97,98 +95,8 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data return nil } -type CSGetTokenPacketFactory struct { -} - -type CSGetTokenHandler struct { -} - -func (f *CSGetTokenPacketFactory) CreatePacket() interface{} { - pack := &clawdoll.CSCLAWDOLLGetToken{} - return pack -} - -func (h *CSGetTokenHandler) Process(s *netlib.Session, packetid int, data interface{}, sid int64) error { - //转发到娃娃机主机 - logger.Logger.Tracef("CSGetTokenHandler") - if _, ok := data.(*clawdoll.CSCLAWDOLLGetToken); ok { - p := base.PlayerMgrSington.GetPlayer(sid) - if p == nil { - logger.Logger.Warn("CSGetTokenHandler p == nil") - return nil - } - - scene := p.GetScene() - if scene == nil { - return nil - } - sceneEx, ok := scene.ExtraData.(*SceneEx) - if !ok { - return nil - } - - machineId := scene.GetDBGameFree().GetId() % 6080000 - machineInfo := sceneEx.GetMachineServerInfo(machineId, p.Platform) - if machineInfo == nil { - logger.Logger.Warn("CSGetTokenHandler machineId = %v not found", machineId) - return nil - } - - logger.Logger.Tracef("获取娃娃机 appId = %v, serverSecret = %v, streamId = %v,snid = %d", machineInfo.AppId, machineInfo.ServerSecret, machineInfo.StreamId, p.SnId) - - //生成token - token, err := token04.GenerateToken04(uint32(machineInfo.AppId), strconv.Itoa(int(p.SnId)), machineInfo.ServerSecret, 7200, "") - if err != nil { - logger.Logger.Error(err) - return err - } - logger.Logger.Trace("======================token========================", token) - - pack := &clawdoll.SCCLAWDOLLSendToken{ - LogicId: scene.DBGameFree.GetId(), - Appid: machineInfo.AppId, - Token: token, - StreamId: machineInfo.StreamId, - } - p.SendToClient(int(clawdoll.CLAWDOLLPacketID_PACKET_SC_SENDTOKEN), pack) - } - return nil -} - -// 娃娃机返回token 通知客户端 -func MSSendTokenHandler(session *netlib.Session, packetId int, data interface{}) error { - logger.Logger.Tracef("MSSendTokenHandler") - if msg, ok := data.(*machine.MSSendToken); ok { - //给客户端返回token - token := msg.Token - p := base.PlayerMgrSington.GetPlayerBySnId(msg.GetSnid()) - if p == nil { - logger.Logger.Warn("MSSendTokenHandler p == nil") - return nil - } - - scene := p.GetScene() - if scene == nil { - return nil - } - - pack := &clawdoll.SCCLAWDOLLSendToken{ - LogicId: scene.DBGameFree.GetId(), - Appid: msg.Appid, - Token: token, - StreamId: msg.StreamId, - } - p.SendToClient(int(clawdoll.CLAWDOLLPacketID_PACKET_SC_SENDTOKEN), pack) - } - return nil -} func init() { common.RegisterHandler(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_PLAYEROP), &CSPlayerOpHandler{}) netlib.RegisterFactory(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_PLAYEROP), &CSPlayerOpPacketFactory{}) netlib.Register(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{}, MSDollMachineoCoinResultHandler) - //客户端请求token - common.RegisterHandler(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_GETTOKEN), &CSGetTokenHandler{}) - netlib.RegisterFactory(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_GETTOKEN), &CSGetTokenPacketFactory{}) - //获取token返回 - netlib.Register(int(machine.DollMachinePacketID_PACKET_MSSendToken), &machine.MSSendToken{}, MSSendTokenHandler) } diff --git a/machine/action/action_server.go b/machine/action/action_server.go index 520fbfe..bbbac92 100644 --- a/machine/action/action_server.go +++ b/machine/action/action_server.go @@ -3,14 +3,12 @@ package action import ( "bytes" "fmt" - "github.com/zegoim/zego_server_assistant/token/go/src/token04" "math" "mongo.games.com/game/machine/machinedoll" "mongo.games.com/game/protocol/machine" "mongo.games.com/goserver/core/logger" "mongo.games.com/goserver/core/netlib" "mongo.games.com/goserver/core/timer" - "strconv" "sync" "time" ) @@ -270,7 +268,7 @@ func SMGameLinkSucceedHandler(session *netlib.Session, packetId int, data interf return nil } -// 获取进入视频房间token +/*// 获取进入视频房间token func SMGetTokenHandler(session *netlib.Session, packetId int, data interface{}) error { logger.Logger.Tracef("SMGetTokenHandler %v", data) msg, ok := data.(*machine.SMGetToken) @@ -309,12 +307,12 @@ func SMGetTokenHandler(session *netlib.Session, packetId int, data interface{}) session.Send(int(machine.DollMachinePacketID_PACKET_MSSendToken), info) fmt.Println("向游戏服务器发送娃娃机token：%v", info) return nil -} +}*/ func init() { netlib.Register(int(machine.DollMachinePacketID_PACKET_SMDollMachinePerate), &machine.SMDollMachineoPerate{}, SMDollMachinePerateHandler) netlib.Register(int(machine.DollMachinePacketID_PACKET_SMDollMachineGrab), &machine.SMDollMachineGrab{}, SMDollMachineGrabHandler) //链接成功 返回消息 netlib.Register(int(machine.DollMachinePacketID_PACKET_SMGameLinkSucceed), &machine.SMGameLinkSucceed{}, SMGameLinkSucceedHandler) - netlib.Register(int(machine.DollMachinePacketID_PACKET_SMGetToken), &machine.SMGetToken{}, SMGetTokenHandler) + //netlib.Register(int(machine.DollMachinePacketID_PACKET_SMGetToken), &machine.SMGetToken{}, SMGetTokenHandler) } diff --git a/protocol/machine/machine.pb.go b/protocol/machine/machine.pb.go index e3cc943..592eab4 100644 --- a/protocol/machine/machine.pb.go +++ b/protocol/machine/machine.pb.go @@ -496,150 +496,6 @@ func (x *MSUpdateDollMachineStatus) GetVideoAddr() string { return "" } -//获取token -type SMGetToken struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Snid int32 `protobuf:"varint,1,opt,name=Snid,proto3" json:"Snid,omitempty"` - AppId int64 `protobuf:"varint,2,opt,name=AppId,proto3" json:"AppId,omitempty"` - ServerSecret string `protobuf:"bytes,3,opt,name=ServerSecret,proto3" json:"ServerSecret,omitempty"` - StreamId string `protobuf:"bytes,4,opt,name=StreamId,proto3" json:"StreamId,omitempty"` -} - -func (x *SMGetToken) Reset() { - *x = SMGetToken{} - if protoimpl.UnsafeEnabled { - mi := &file_machine_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SMGetToken) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SMGetToken) ProtoMessage() {} - -func (x *SMGetToken) ProtoReflect() protoreflect.Message { - mi := &file_machine_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SMGetToken.ProtoReflect.Descriptor instead. -func (*SMGetToken) Descriptor() ([]byte, []int) { - return file_machine_proto_rawDescGZIP(), []int{7} -} - -func (x *SMGetToken) GetSnid() int32 { - if x != nil { - return x.Snid - } - return 0 -} - -func (x *SMGetToken) GetAppId() int64 { - if x != nil { - return x.AppId - } - return 0 -} - -func (x *SMGetToken) GetServerSecret() string { - if x != nil { - return x.ServerSecret - } - return "" -} - -func (x *SMGetToken) GetStreamId() string { - if x != nil { - return x.StreamId - } - return "" -} - -//返回token -type MSSendToken struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Snid int32 `protobuf:"varint,1,opt,name=Snid,proto3" json:"Snid,omitempty"` - Appid int64 `protobuf:"varint,2,opt,name=Appid,proto3" json:"Appid,omitempty"` - Token string `protobuf:"bytes,3,opt,name=Token,proto3" json:"Token,omitempty"` - StreamId string `protobuf:"bytes,4,opt,name=StreamId,proto3" json:"StreamId,omitempty"` -} - -func (x *MSSendToken) Reset() { - *x = MSSendToken{} - if protoimpl.UnsafeEnabled { - mi := &file_machine_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MSSendToken) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MSSendToken) ProtoMessage() {} - -func (x *MSSendToken) ProtoReflect() protoreflect.Message { - mi := &file_machine_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MSSendToken.ProtoReflect.Descriptor instead. -func (*MSSendToken) Descriptor() ([]byte, []int) { - return file_machine_proto_rawDescGZIP(), []int{8} -} - -func (x *MSSendToken) GetSnid() int32 { - if x != nil { - return x.Snid - } - return 0 -} - -func (x *MSSendToken) GetAppid() int64 { - if x != nil { - return x.Appid - } - return 0 -} - -func (x *MSSendToken) GetToken() string { - if x != nil { - return x.Token - } - return "" -} - -func (x *MSSendToken) GetStreamId() string { - if x != nil { - return x.StreamId - } - return "" -} - var File_machine_proto protoreflect.FileDescriptor var file_machine_proto_rawDesc = []byte{ @@ -677,44 +533,29 @@ var file_machine_proto_rawDesc = []byte{ 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x56, 0x69, 0x64, 0x65, 0x6f, 0x41, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x56, 0x69, 0x64, 0x65, 0x6f, 0x41, - 0x64, 0x64, 0x72, 0x22, 0x76, 0x0a, 0x0a, 0x53, 0x4d, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, - 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x70, 0x70, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x41, 0x70, 0x70, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x53, - 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, - 0x1a, 0x0a, 0x08, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x22, 0x69, 0x0a, 0x0b, 0x4d, - 0x53, 0x53, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x14, - 0x0a, 0x05, 0x41, 0x70, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x41, - 0x70, 0x70, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x74, - 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x74, - 0x72, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x2a, 0xb9, 0x02, 0x0a, 0x13, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, - 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x1c, - 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, - 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x5a, 0x65, 0x72, 0x6f, 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x18, - 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x69, 0x6e, - 0x6b, 0x53, 0x75, 0x63, 0x63, 0x65, 0x65, 0x64, 0x10, 0xa0, 0x9c, 0x01, 0x12, 0x20, 0x0a, 0x1a, - 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, - 0x68, 0x69, 0x6e, 0x65, 0x50, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0xa1, 0x9c, 0x01, 0x12, 0x1e, - 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, - 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x47, 0x72, 0x61, 0x62, 0x10, 0xa2, 0x9c, 0x01, 0x12, 0x1e, - 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4d, 0x53, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, - 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x10, 0xa3, 0x9c, 0x01, 0x12, 0x26, - 0x0a, 0x20, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4d, 0x53, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x53, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x10, 0xa4, 0x9c, 0x01, 0x12, 0x27, 0x0a, 0x21, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, - 0x5f, 0x4d, 0x53, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x6f, 0x50, - 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x10, 0xa5, 0x9c, 0x01, 0x12, - 0x17, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x47, 0x65, 0x74, 0x54, - 0x6f, 0x6b, 0x65, 0x6e, 0x10, 0xa6, 0x9c, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, - 0x45, 0x54, 0x5f, 0x4d, 0x53, 0x53, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x10, 0xa7, - 0x9c, 0x01, 0x42, 0x27, 0x5a, 0x25, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, - 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x63, 0x6f, 0x6c, 0x2f, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x64, 0x64, 0x72, 0x2a, 0xb9, 0x02, 0x0a, 0x13, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, + 0x69, 0x6e, 0x65, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x18, 0x50, + 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, + 0x69, 0x6e, 0x65, 0x5a, 0x65, 0x72, 0x6f, 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x18, 0x50, 0x41, 0x43, + 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x53, 0x75, + 0x63, 0x63, 0x65, 0x65, 0x64, 0x10, 0xa0, 0x9c, 0x01, 0x12, 0x20, 0x0a, 0x1a, 0x50, 0x41, 0x43, + 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, + 0x65, 0x50, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0xa1, 0x9c, 0x01, 0x12, 0x1e, 0x0a, 0x18, 0x50, + 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, + 0x69, 0x6e, 0x65, 0x47, 0x72, 0x61, 0x62, 0x10, 0xa2, 0x9c, 0x01, 0x12, 0x1e, 0x0a, 0x18, 0x50, + 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4d, 0x53, 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, + 0x69, 0x6e, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x10, 0xa3, 0x9c, 0x01, 0x12, 0x26, 0x0a, 0x20, 0x50, + 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4d, 0x53, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x6f, + 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, + 0xa4, 0x9c, 0x01, 0x12, 0x27, 0x0a, 0x21, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4d, 0x53, + 0x44, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x6f, 0x50, 0x65, 0x72, 0x61, + 0x74, 0x65, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x10, 0xa5, 0x9c, 0x01, 0x12, 0x17, 0x0a, 0x11, + 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x4d, 0x47, 0x65, 0x74, 0x54, 0x6f, 0x6b, 0x65, + 0x6e, 0x10, 0xa6, 0x9c, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, + 0x4d, 0x53, 0x53, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x10, 0xa7, 0x9c, 0x01, 0x42, + 0x27, 0x5a, 0x25, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, + 0x2f, 0x6d, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -730,7 +571,7 @@ func file_machine_proto_rawDescGZIP() []byte { } var file_machine_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_machine_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_machine_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_machine_proto_goTypes = []interface{}{ (DollMachinePacketID)(0), // 0: machine.DollMachinePacketID (*SMGameLinkSucceed)(nil), // 1: machine.SMGameLinkSucceed @@ -740,8 +581,6 @@ var file_machine_proto_goTypes = []interface{}{ (*MSDollMachineList)(nil), // 5: machine.MSDollMachineList (*DollMachine)(nil), // 6: machine.DollMachine (*MSUpdateDollMachineStatus)(nil), // 7: machine.MSUpdateDollMachineStatus - (*SMGetToken)(nil), // 8: machine.SMGetToken - (*MSSendToken)(nil), // 9: machine.MSSendToken } var file_machine_proto_depIdxs = []int32{ 6, // 0: machine.MSDollMachineList.data:type_name -> machine.DollMachine @@ -842,30 +681,6 @@ func file_machine_proto_init() { return nil } } - file_machine_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMGetToken); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_machine_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MSSendToken); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -873,7 +688,7 @@ func file_machine_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_machine_proto_rawDesc, NumEnums: 1, - NumMessages: 9, + NumMessages: 7, NumExtensions: 0, NumServices: 0, }, diff --git a/protocol/machine/machine.proto b/protocol/machine/machine.proto index a109267..ba7c784 100644 --- a/protocol/machine/machine.proto +++ b/protocol/machine/machine.proto @@ -58,18 +58,4 @@ message MSUpdateDollMachineStatus{ int32 Id = 1; int32 Status = 2; //1-空闲 0-无法使用 string VideoAddr = 3; -} -//获取token -message SMGetToken{ - int32 Snid = 1; - int64 AppId = 2; - string ServerSecret = 3; - string StreamId = 4; -} -//返回token -message MSSendToken{ - int32 Snid = 1; - int64 Appid = 2; - string Token = 3; - string StreamId = 4; } \ No newline at end of file From 7099975e9ed88d3d19b56d26faca5fd5b9229898 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 7 Sep 2024 14:48:44 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=AF=B7?= =?UTF-8?q?=E6=B1=82token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/clawdoll/action_clawdoll.go | 63 +++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gamesrv/clawdoll/action_clawdoll.go b/gamesrv/clawdoll/action_clawdoll.go index 8e67d2d..76e7758 100644 --- a/gamesrv/clawdoll/action_clawdoll.go +++ b/gamesrv/clawdoll/action_clawdoll.go @@ -1,6 +1,7 @@ package clawdoll import ( + "github.com/zegoim/zego_server_assistant/token/go/src/token04" "mongo.games.com/game/common" rule "mongo.games.com/game/gamerule/clawdoll" "mongo.games.com/game/gamesrv/base" @@ -8,6 +9,7 @@ import ( "mongo.games.com/game/protocol/machine" "mongo.games.com/goserver/core/logger" "mongo.games.com/goserver/core/netlib" + "strconv" ) type CSPlayerOpPacketFactory struct { @@ -95,8 +97,69 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data return nil } +type CSGetTokenPacketFactory struct { +} + +type CSGetTokenHandler struct { +} + +func (f *CSGetTokenPacketFactory) CreatePacket() interface{} { + pack := &clawdoll.CSCLAWDOLLGetToken{} + return pack +} + +func (h *CSGetTokenHandler) Process(s *netlib.Session, packetid int, data interface{}, sid int64) error { + //转发到娃娃机主机 + logger.Logger.Tracef("CSGetTokenHandler") + if _, ok := data.(*clawdoll.CSCLAWDOLLGetToken); ok { + p := base.PlayerMgrSington.GetPlayer(sid) + if p == nil { + logger.Logger.Warn("CSGetTokenHandler p == nil") + return nil + } + + scene := p.GetScene() + if scene == nil { + return nil + } + sceneEx, ok := scene.ExtraData.(*SceneEx) + if !ok { + return nil + } + + machineId := scene.GetDBGameFree().GetId() % 6080000 + machineInfo := sceneEx.GetMachineServerInfo(machineId, p.Platform) + if machineInfo == nil { + logger.Logger.Warn("CSGetTokenHandler machineId = %v not found", machineId) + return nil + } + + logger.Logger.Tracef("获取娃娃机 appId = %v, serverSecret = %v, streamId = %v,snid = %d", machineInfo.AppId, machineInfo.ServerSecret, machineInfo.StreamId, p.SnId) + + //生成token + token, err := token04.GenerateToken04(uint32(machineInfo.AppId), strconv.Itoa(int(p.SnId)), machineInfo.ServerSecret, 3600, "") + if err != nil { + logger.Logger.Error(err) + return err + } + logger.Logger.Trace("======================token========================", token) + + pack := &clawdoll.SCCLAWDOLLSendToken{ + LogicId: scene.DBGameFree.GetId(), + Appid: machineInfo.AppId, + Token: token, + StreamId: machineInfo.StreamId, + } + p.SendToClient(int(clawdoll.CLAWDOLLPacketID_PACKET_SC_SENDTOKEN), pack) + } + return nil +} + func init() { common.RegisterHandler(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_PLAYEROP), &CSPlayerOpHandler{}) netlib.RegisterFactory(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_PLAYEROP), &CSPlayerOpPacketFactory{}) netlib.Register(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{}, MSDollMachineoCoinResultHandler) + //客户端请求token + common.RegisterHandler(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_GETTOKEN), &CSGetTokenHandler{}) + netlib.RegisterFactory(int(clawdoll.CLAWDOLLPacketID_PACKET_CS_GETTOKEN), &CSGetTokenPacketFactory{}) } From d61a1539486fdabcc679c989bed67177c7032c94 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 7 Sep 2024 16:22:12 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=8A=95=E5=B8=81=E5=90=8E=E5=90=91?= =?UTF-8?q?=E5=89=8D=E7=A7=BB=E5=8A=A8=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/clawdoll/action_clawdoll.go | 2 ++ machine/action/action_server.go | 7 ------- machine/machinedoll/command.go | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gamesrv/clawdoll/action_clawdoll.go b/gamesrv/clawdoll/action_clawdoll.go index 76e7758..fab8d37 100644 --- a/gamesrv/clawdoll/action_clawdoll.go +++ b/gamesrv/clawdoll/action_clawdoll.go @@ -76,6 +76,8 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data case 1: if msg.Result == 1 { logger.Logger.Tracef("上分成功！！！！！！！！！！！！snid = ", msg.Snid) + //发送向前移动指令 + sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonFront) } else { logger.Logger.Tracef("上分失败！！！！！！！！！！！！snid = ", msg.Snid) } diff --git a/machine/action/action_server.go b/machine/action/action_server.go index bbbac92..2eb245c 100644 --- a/machine/action/action_server.go +++ b/machine/action/action_server.go @@ -119,13 +119,6 @@ func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data inte Process(conn, f1, f2) case 5: //投币 - /* f1 := []func(){ - func() { machinedoll.Coin(conn) }, - } - f2 := []func(){ - func() {}, - } - Process(conn, f1, f2)*/ machinedoll.Coin(conn) go DollMachineGrabResult(session, conn, msg.Snid, msg.GetId()) } diff --git a/machine/machinedoll/command.go b/machine/machinedoll/command.go index 5ed8a95..bab7a18 100644 --- a/machine/machinedoll/command.go +++ b/machine/machinedoll/command.go @@ -382,7 +382,7 @@ var data = []byte{ 0x65, //0 几币几玩 0x00, //1 几币几玩占用位 0x2D, //2 游戏时间 - 0x00, //3 出奖模式0 无概率 1 随机模式 2 固定模式 3 冠兴模式 + 0x01, //3 出奖模式0 无概率 1 随机模式 2 固定模式 3 冠兴模式 0x0F, //4 出奖概率 0x00, //5 出奖概率占用位 0x00, //6 空中抓物 0关闭 1开启