From d108cfd1869f8abeb302c963e2ac05790b6695ad Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Tue, 8 Oct 2024 15:38:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=81=93=E5=85=B7=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/bagmgr.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worldsrv/bagmgr.go b/worldsrv/bagmgr.go
index e1d223d..6e9fb45 100644
--- a/worldsrv/bagmgr.go
+++ b/worldsrv/bagmgr.go
@@ -359,7 +359,7 @@ func (this *BagMgr) CallbackAfter(ret *internal.PlayerLoadReplay) {
 					this.OnChangeFuncs(&model.ChangeItemParam{
 						SnId:         p.SnId,
 						ItemId:       v.ItemId,
-						ItemNum:      num,
+						ItemNum:      v.Count,
 						GainWay:      v.TypeId,
 						RoomConfigId: v.RoomConfigId,
 						GameId:       v.GameId,
@@ -712,7 +712,7 @@ func (this *BagMgr) AddItems(param *model.AddItemParam) (*BagInfo, bag.OpResultC
 		this.OnChangeFuncs(&model.ChangeItemParam{
 			SnId:         p.SnId,
 			ItemId:       v.ItemId,
-			ItemNum:      num,
+			ItemNum:      v.ItemNum,
 			GainWay:      param.GainWay,
 			RoomConfigId: param.RoomConfigId,
 			GameId:       param.GameId,

From 548681d43517a029df403667120cbaa4766c6a1f Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Sat, 12 Oct 2024 17:02:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=A5=96=E5=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/addmail.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/worldsrv/addmail.go b/worldsrv/addmail.go
index 8faf733..6932630 100644
--- a/worldsrv/addmail.go
+++ b/worldsrv/addmail.go
@@ -114,8 +114,8 @@ func AddMailClientUpgrade(snid int32, items []*webapi.ItemInfo) {
 		})
 	}
 
-	content := i18n.Tr("languages", "UpgradeTitle")
-	title := i18n.Tr("languages", "Upgrade")
+	title := i18n.Tr("languages", "UpgradeTitle")
+	content := i18n.Tr("languages", "Upgrade")
 
 	AddMail(&AddMailParam{
 		Tp:      model.MSGTYPE_ITEM,
@@ -123,5 +123,6 @@ func AddMailClientUpgrade(snid int32, items []*webapi.ItemInfo) {
 		Title:   title,
 		Content: content,
 		Items:   arr,
+		ShowId:  model.HallAll,
 	})
 }

From 41ddf303364791b2ccd420efd5cbd0394a4f4bcd Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Sat, 12 Oct 2024 17:38:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 machine/action/action_server.go | 4 ++++
 machine/machinedoll/command.go  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/machine/action/action_server.go b/machine/action/action_server.go
index 92d3990..ede6787 100644
--- a/machine/action/action_server.go
+++ b/machine/action/action_server.go
@@ -181,6 +181,10 @@ func DollMachineGrabResult(conn *machinedoll.Conn, snid, id int32) {
 		n, err := conn.Read(buf)
 		if err != nil {
 			logger.Logger.Error("Failed to read response from client:", err)
+			err := conn.Conn.Close()
+			if err != nil {
+				return
+			}
 			return
 		}
 		// 将读取到的数据按照 221 进行分割
diff --git a/machine/machinedoll/command.go b/machine/machinedoll/command.go
index bab7a18..3bb9bb2 100644
--- a/machine/machinedoll/command.go
+++ b/machine/machinedoll/command.go
@@ -383,7 +383,7 @@ var data = []byte{
 	0x00, //1 几币几玩占用位
 	0x2D, //2 游戏时间
 	0x01, //3 出奖模式0 无概率 1 随机模式 2 固定模式 3 冠兴模式
-	0x0F, //4 出奖概率
+	0x0A, //4 出奖概率
 	0x00, //5 出奖概率占用位
 	0x00, //6 空中抓物 0关闭 1开启
 	0x00, //7 连续投币赠送 范围0~100
@@ -409,7 +409,7 @@ var data = []byte{
 	0x06, //25 放线长度占用位
 	0x00, //26 礼品下放高度
 	0x00, //27 礼品下放高度占用位
-	0x14, //28 甩抓长度
+	0x00, //28 甩抓长度
 	0x00, //29 甩抓保护
 
 	0x78, //30 甩抓电压