Merge branch 'develop' into release

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 (

worldsrv/action_server.go

@@ -509,6 +509,24 @@ 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.TaskTypeTienlenWinCoin, &TaskData{
+								SnId:       player.SnId,
+								GameID:     scene.gameId,
+								GameFreeID: scene.dbGameFree.GetId(),
+								Num:        playerBet.GetGain(),
+							})
+						}
 						if playerBet.GetGain() > 0 || playerBet.WinState == 1 {
 							TaskSubjectSingleton.Touch(common.TaskTypeTienlenWinTimes, &TaskData{
 								SnId:       player.SnId,

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)
 }

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 = math.Round(addDiamond*10000) / 10000
-	addDiamond, _ = strconv.ParseFloat(diamondStr, 64)
 	p.WelfData.DiamondBank.BankDiamond += addDiamond
 	pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
 	infoData := pool[0]