Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

2024-09-23 14:59:40 +08:00 · 2024-09-23 14:59:40 +08:00 · ef6236e3a8
parent 5ab84bd13e ecf47d9f55
commit ef6236e3a8
2 changed files with 112 additions and 111 deletions
--- a/common/constant.go
+++ b/common/constant.go
@ -318,6 +318,7 @@ const (
 	GainWayItemShopChangeDoll                = 110 // 商城兑换娃娃
 	GainWayItemBagChangeDoll                 = 111 // 背包内兑换娃娃
 	GainWayClawdollCatch                     = 112 // 娃娃机抓取到娃娃获取卡
+	GainWayItemBagChangeDollRevocation       = 113 //娃娃兑换后台撤销
 )

 // 后台选择 金币变化类型 的充值 类型id号起始
--- a/worldsrv/action_bag.go
+++ b/worldsrv/action_bag.go
@ -614,7 +614,7 @@ func CSDollChange(s *netlib.Session, packetid int, data interface{}, sid int64)
 			Change: []*model.Item{
 				{
 					ItemId:  item.GetItemId(),
-					ItemNum: 1,
+					ItemNum: -1,
 				},
 			},
 			GainWay:  common.GainWayItemBagChangeDoll,