From 7d98b14f5be7a32581c128e289ca755e944c9845 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Tue, 25 Jun 2024 18:42:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=BB=E7=9F=B3=E5=AD=98=E9=92=B1=E7=BD=90?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/DB_Pigbank_Prop.dat | 5 +++-- data/DB_Pigbank_Prop.json | 6 ++++-- data/DB_PropExchange.dat | Bin 384 -> 384 bytes data/DB_Task.dat | Bin 2161 -> 2161 bytes worldsrv/taskmgr.go | 7 ++++++- worldsrv/welfmgr.go | 26 +++++++++++++++++++++++--- xlsx/DB_Pigbank_Prop.xlsx | Bin 13793 -> 13751 bytes 7 files changed, 36 insertions(+), 8 deletions(-) diff --git a/data/DB_Pigbank_Prop.dat b/data/DB_Pigbank_Prop.dat index c071c30..264bbdf 100644 --- a/data/DB_Pigbank_Prop.dat +++ b/data/DB_Pigbank_Prop.dat @@ -3,6 +3,7 @@  LoseCoinRate  DayBuyMaxCnt -WinCoinRateDiamond -LoseCoinRateDiamond +WinCoinRateDiamond +LoseCoinRateDiamond + DayBuyMaxCntDiamond \ No newline at end of file diff --git a/data/DB_Pigbank_Prop.json b/data/DB_Pigbank_Prop.json index 25da528..0d31012 100644 --- a/data/DB_Pigbank_Prop.json +++ b/data/DB_Pigbank_Prop.json @@ -17,11 +17,13 @@ }, { "Id": 4, - "PorpName": "WinCoinRateDiamond" + "PorpName": "WinCoinRateDiamond", + "PropValue": 5 }, { "Id": 5, - "PorpName": "LoseCoinRateDiamond" + "PorpName": "LoseCoinRateDiamond", + "PropValue": 10 }, { "Id": 6, diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 0a0ae963741e23ec0945e1dc13e3da82d9dc8fed..26840cdc899aae8ab88f18171a33b3b83d002d36 100644 GIT binary patch literal 384 zcmd-w<6snElw#w!-o^~3FGJ}oQ2HvAz6PR|I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwf4?1AY+Q4e$ny1g)SVeW#sgA?qIhP97axMDe2zz)Hx5NIGSi|#-jif$p; SflBNgi+~>e!py}$TL=JVqC7PK literal 384 zcmd-w<6snElw#w!+{O&1uR!UmQ2H8_z7C?5I5-yevI!h$vE|a^U;?YZ0hPZArEfv$ z+i2>;IUwf4>;anxv=^6tT<(CF%L#Tz!`eqIT(KN1V28jQjBYTBgRpoM=0TVT?tmT6 P&anvS(J#zg477y+WI{YO diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 6abcc6554a4d081ec83897ebd3f3d51da647e9fb..bfc53afca6126d0c603067ac7cb47b0950616e6e 100644 GIT binary patch delta 385 zcmew;@KHd4ONoO~fKh@`fl-6efYFMBV_`3wz=bwuD>jZLKo;vnh1r4-!3Di+P(hK6 zXEGRJqKD*wq8Hnk1z0A#G8qU$*jzA!mikO?W11nv2{!h?w2e$a#fyOEa!od1PPBxu znW2gwEEjTMZS1kZr1=7tr`4n?9&?*oc=4PPtCfl)m zo*cv?#<}?wqX0k92$so(EHaaGSou*L3o)UGH6Duze^^&de!(K5r~>v9E6@yf4KAPy zFzvd{)~yKj3)KAwT5P?T7(qU`1`G~mklxAj*(4^!t9C0f*a3dFbcA9 zTx??&V1ddlI3zdOmB~O5s&c6hP%lWHYjPXY3?Vj-ML_*rR-9mS4ous~G}(YT(GsHg z!Ezy>Vvqu62SzS6jwyZu!V;_s+!_rRZXf=_1a<~U7Um3)Ri~JfCvRaFoNUMPSstR7 z3F?povv`1}D06In#VEiJG=^nzA&bo999DjygV9atVT}iy@`rU5)D#h@DGi-fKvPt} zUSI{9!alixQEc*Uw(iMS7zG5myqFk4F1-fypfXtYA&bQ1`RwLUJCNKm`8j(R0IB0# A0ssI2 diff --git a/worldsrv/taskmgr.go b/worldsrv/taskmgr.go index cc7ad77..c46cd04 100644 --- a/worldsrv/taskmgr.go +++ b/worldsrv/taskmgr.go @@ -107,13 +107,18 @@ func (t *TaskHandle) TaskUpdate(id int, data any) { case common.TaskTypeWinOrLose: // 游戏输赢金币数量 p.PhoneLotteryTask(common.TaskTypeWinOrLose, num) + if !p.IsRob { + WelfareMgrSington.UpdateDiamondBankData(p, num, false) + } case common.TaskTypeTienlenCount: //tienlen游戏场次 p.PhoneLotteryTask(common.TaskTypeTienlenCount, 1) case common.TaskTypeBindInviter: // 绑定邀请人数量 p.InviteTask(common.InviteScoreTypeBind, 0, num) case common.TaskTypeWinCoin: // 赢取金币数量 - + if !p.IsRob { + WelfareMgrSington.UpdateDiamondBankData(p, num, true) + } case common.TaskTypeTienlenWinTimes: // tienlen游戏赢取次数 case common.TaskTypeActivityScore: // 活跃积分数量 diff --git a/worldsrv/welfmgr.go b/worldsrv/welfmgr.go index dcbf424..2289a17 100644 --- a/worldsrv/welfmgr.go +++ b/worldsrv/welfmgr.go @@ -1897,9 +1897,29 @@ func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) { } } -// 更新数据 -func (this *WelfareMgr) UpdateDiamondBankData(p *Player) { - +// 更新钻石存储罐数据 +func (this *WelfareMgr) UpdateDiamondBankData(p *Player, coinNum int64, isWin bool) { + logger.Logger.Trace("更新钻石存储罐数据!!!!!!!!!!") + if p.WelfData.DiamondBank == nil { + p.WelfData.DiamondBank = &model.DiamondBankData{} + } + fGetPropValue := func(propName string) int32 { + pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr() + for _, PropItem := range pool { + if PropItem.PorpName == propName { + return PropItem.PropValue + } + } + return 0 + } + WinCoinRate := fGetPropValue("WinCoinRateDiamond") + LoseCoinRate := fGetPropValue("LoseCoinRateDiamond") + if isWin { + p.WelfData.DiamondBank.BankDiamond += float64(coinNum) * float64(WinCoinRate/10000000) + } else { + p.WelfData.DiamondBank.BankDiamond += float64(coinNum) * float64(LoseCoinRate/10000000) + } + logger.Logger.Tracef("更新钻石存储罐数据 snid = %d,coinNum = %d,isWin = %s,当前钻石存储罐钻石数量：%f", p.SnId, coinNum, isWin, p.WelfData.DiamondBank.BankDiamond) } func (this *WelfareMgr) Update() { diff --git a/xlsx/DB_Pigbank_Prop.xlsx b/xlsx/DB_Pigbank_Prop.xlsx index 4dffb7ee52befd2ba5aeb73220e6f3ea8d23f2a5..8b44f8e42d80f5566751d97fcf89901803782a89 100644 GIT binary patch delta 2276 zcmVuII%fkc{>h$PVj@Q4ThrccjkJ)q%J%Ioupv6*V|&j1^_-h#i=C>1 zPcT;2I!AFtPym|OLh4P9p37x8M}c)r3s%({aL)=1VcV8}1;nU4SavjET8DG&Pp@h73@Bf(Zq7E18km6rrauJeQm|T`Ip=nCV z)r5Ei6d6AG9>o_>O9KQH000080EbTEK$iIF+a>`301lHp111N_z0HpxZtKBlnS+ybU{zdSWe?Vj()wPyC?K@U!NL1+ z388BaQq?XAu?|URtg3w|?H-!0>l;~_W>QjnND!LCW^&%Bc>KbF58m?V|B7r)bGCE4 z?P(0UMfM3lMV<0}n}gSi@~WbU#$;~8c#IJ)W0ta;7%dPYCEoxx>jNJ zyT|*0ZKuYUQ$MsjX#@J`m&5q%ye$Z#B*r8OH%#!H5thO4FoPF|f7+xMn_Is7F`lO- zCVZAI1ZOi!@tSdgv8ZU3mZD0j? zhAIk~(Syo%71cI?XexyTf3ua1>CoQtpTf(vXpw8j=Y--zu=IGz%^AN+W?C6l*eFv~ z9H^aVIgjUqJge*s=mW7TpOok+mkVEkCmk;rxrBii-eM!=<1d;wX>zH=_~E2gf-=N!!@9|m-{DD8vr+Xc-$cYkBwODLEC?L0gV ze7$6@S(Xc}T84uJ;y(Xrgl!FqfCHc0U!&leGk<{{D-a(d8LaM?lSRCT;@QDtb?%W2 zJ=Vb^0plLzs&|P&q-O)}7umo*VsqUCdA_T2kDH;#I(Q7&-1aU5HXwYF4eXwcQ)QI% zsHV=U_7NTA5l1jUn~UXz(o~c z?^QU~G8Ce-9Yr|NI`l$t`9URcVPE9nF7&Pvqh?zL+n^H3sBUF(L3kNIE=8EOVRSTN zLw^Xpk+oqZW;`y4XgZ%?Pj0(ENUFnN{lJ2o!$r8^819MgZHtcx!qAySI2(mhwtK<6 zb$dRO-8Hx<8q&}58)h9wxzZA!3;ru1<&Dx-3u)by4PcKR#oZSDXU+0Evv3G-A_>s0 zF&ypz002po=_(_C9vlE>P^ zAD?rt8YAaSjm;Hn1xhtiK#VbnJGAbw^d2{zJEn3CM0edCb|oU z%5#zOxk`5xm$oI*ykr*Sn?lqEN7G!CeA7BYtgi1_1-cIDwlguQC+^1Ot;n0~M3oGAajK1ONbdY%i0& zG#ryCGY$a|lQ%Oq0XLIwGe-hjC6k~f7L(00Dgh6Z_%k{IM3XZ#HUeuClduyNlYlf3 z8_=#X9PR-C07(P@01p5F000000096X0001~ldCj50eq9_G$9-%yH4<{X y000000000103ZMW0H_3$u{9NwIyEl>M+lR#H5HS9H7@~4ldv@_1`aU*0000#p(Y~$ delta 2342 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