From d11f7f75c267bc798e36137a431a8fcc22693618 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 29 Jun 2024 18:03:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=92=BB=E7=9F=B3=E5=AD=98=E9=92=B1?= =?UTF-8?q?=E7=BD=90=20BUG=E4=BF=AE=E6=94=B9=E5=8F=AA=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=82=B9=E5=90=8E4=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/welfmgr.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/worldsrv/welfmgr.go b/worldsrv/welfmgr.go index d5891f9..9ea3150 100644 --- a/worldsrv/welfmgr.go +++ b/worldsrv/welfmgr.go @@ -3,7 +3,6 @@ package main import ( "fmt" "math" - "strconv" "time" "mongo.games.com/goserver/core/logger" @@ -1936,8 +1935,7 @@ func (this *WelfareMgr) UpdateDiamondBankData(p *Player, coinNum int64, isWin bo addDiamond = float64(coinNum) * float64(LoseCoinRate) / 10000000 } //保留小数点后4位 - diamondStr := fmt.Sprintf("%.4f", addDiamond) - addDiamond, _ = strconv.ParseFloat(diamondStr, 64) + addDiamond = math.Round(addDiamond*10000) / 10000 p.WelfData.DiamondBank.BankDiamond += addDiamond pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr() infoData := pool[0] From 8199231ac763d491a1bd65e525c69fc21a928502 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Sat, 29 Jun 2024 18:24:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=92=BB=E7=9F=B3=E5=AD=98=E9=92=B1?= =?UTF-8?q?=E7=BD=90=E9=9C=80=E6=B1=82=E6=9B=B4=E6=94=B9=E5=8F=AA=E5=9C=A8?= =?UTF-8?q?tienlen=E4=B8=AD=E5=A2=9E=E5=8A=A0=E9=92=BB=E7=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/constant.go | 3 +++ worldsrv/action_server.go | 13 ++++++++++++- worldsrv/taskmgr.go | 11 ++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/common/constant.go b/common/constant.go index 5cfc959..e411c4c 100644 --- a/common/constant.go +++ b/common/constant.go @@ -276,6 +276,7 @@ const ( GainWay_PigrankGainDiamond = 90 //存钱罐打开获取钻石 GainWaySign7Add = 91 // 累计签到进阶奖励获得 GainWayItemChange = 92 //背包内使用道具兑换话费 + GainWayPetSkillLevelUp = 93 //宠物技能升级 ) // 后台选择 金币变化类型 的充值 类型id号起始 @@ -676,6 +677,8 @@ const ( TaskTypeTurnplate = 17 // 转盘抽奖次数 TaskTypeInviteRecharge = 18 // 被邀请人充值金额* TaskTypeLoseCoin = 19 // 输的金币数量 + TaskTypeTienlenLoseCoin = 20 // Tienlen输的金币数量 + TaskTypeTienlenWinCoin = 21 // Tienlen赢取金币数量 ) const ( diff --git a/worldsrv/action_server.go b/worldsrv/action_server.go index 56bdfb8..79b359b 100644 --- a/worldsrv/action_server.go +++ b/worldsrv/action_server.go @@ -492,6 +492,7 @@ func init() { Num: playerBet.GetGain(), }) } + //游戏中输金币 if playerBet.GetGain() < 0 && playerBet.WinState != 1 { TaskSubjectSingleton.Touch(common.TaskTypeLoseCoin, &TaskData{ SnId: player.SnId, @@ -509,8 +510,18 @@ func init() { GameFreeID: scene.dbGameFree.GetId(), Num: 1, }) + //tienlen 游戏输的金币 + if playerBet.GetGain() < 0 && playerBet.WinState != 1 { + TaskSubjectSingleton.Touch(common.TaskTypeTienlenLoseCoin, &TaskData{ + SnId: player.SnId, + GameID: scene.gameId, + GameFreeID: scene.dbGameFree.GetId(), + Num: playerBet.GetGain(), + }) + } + //tienlen 游戏赢的金币 if playerBet.GetGain() > 0 || playerBet.WinState == 1 { - TaskSubjectSingleton.Touch(common.TaskTypeTienlenWinTimes, &TaskData{ + TaskSubjectSingleton.Touch(common.TaskTypeTienlenWinCoin, &TaskData{ SnId: player.SnId, GameID: scene.gameId, GameFreeID: scene.dbGameFree.GetId(), diff --git a/worldsrv/taskmgr.go b/worldsrv/taskmgr.go index 08e8153..abf8bf7 100644 --- a/worldsrv/taskmgr.go +++ b/worldsrv/taskmgr.go @@ -111,9 +111,9 @@ func (t *TaskHandle) TaskUpdate(id int, data any) { case common.TaskTypeBindInviter: // 绑定邀请人数量 case common.TaskTypeWinCoin: // 赢取金币数量 - WelfareMgrSington.UpdateDiamondBankData(p, num, true) + case common.TaskTypeLoseCoin: //输的金币数量 - WelfareMgrSington.UpdateDiamondBankData(p, int64(math.Abs(float64(num))), false) + case common.TaskTypeTienlenWinTimes: // tienlen游戏赢取次数 case common.TaskTypeActivityScore: // 活跃积分数量 @@ -129,7 +129,10 @@ func (t *TaskHandle) TaskUpdate(id int, data any) { case common.TaskTypeTurnplate: p.CollectTask(common.TaskTypeTurnplate, num) - + case common.TaskTypeTienlenWinCoin: // tienlen游戏赢取金币数量 + WelfareMgrSington.UpdateDiamondBankData(p, num, true) + case common.TaskTypeTienlenLoseCoin: // tienlen游戏输金币数量 + WelfareMgrSington.UpdateDiamondBankData(p, int64(math.Abs(float64(num))), false) default: return } @@ -246,4 +249,6 @@ func init() { TaskSubjectSingleton.Attach(common.TaskTypeTurnplate, taskHandle) TaskSubjectSingleton.Attach(common.TaskTypeInviteRecharge, taskHandle) TaskSubjectSingleton.Attach(common.TaskTypeLoseCoin, taskHandle) + TaskSubjectSingleton.Attach(common.TaskTypeTienlenLoseCoin, taskHandle) + TaskSubjectSingleton.Attach(common.TaskTypeTienlenWinCoin, taskHandle) }