From bf1efc0139dbd62a2aab06f5bb170924f2b49383 Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Sat, 21 Sep 2024 15:39:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A8=83=E5=A8=83=E5=85=91=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/action_bag.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/worldsrv/action_bag.go b/worldsrv/action_bag.go
index 8244a05..54e4f59 100644
--- a/worldsrv/action_bag.go
+++ b/worldsrv/action_bag.go
@@ -520,14 +520,14 @@ func CSDollChange(s *netlib.Session, packetid int, data interface{}, sid int64)
 	pack := &bag.SCDollChange{}
 	for _, item := range msg.Items {
 		if item.ItemId == 0 {
-			continue
+			return nil
 		}
 		info := srvdata.GameItemMgr.Get(p.Platform, item.ItemId)
 		if info == nil {
-			continue
+			return nil
 		}
 		if info.Type != common.ItemTypeDoll {
-			continue
+			return nil
 		}
 
 		bagInfo, rest, isF := BagMgrSingleton.AddItemsV2(&model.AddItemParam{

From 8952d98f7d286dbc1096c37dcabf86d44d448e0c Mon Sep 17 00:00:00 2001
From: kxdd <kxdd@ws123456.com>
Date: Sat, 21 Sep 2024 17:07:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=9C=BA=E6=8E=A8?=
 =?UTF-8?q?=E6=B5=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamesrv/clawdoll/scene_clawdoll.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gamesrv/clawdoll/scene_clawdoll.go b/gamesrv/clawdoll/scene_clawdoll.go
index aa184cc..7b063fb 100644
--- a/gamesrv/clawdoll/scene_clawdoll.go
+++ b/gamesrv/clawdoll/scene_clawdoll.go
@@ -129,7 +129,8 @@ func (this *SceneEx) OnPlayerEnter(p *base.Player, reason int) {
 		return
 	}
 
-	if this.GetPlayerNum() >= 1 && this.GetPlayerNum() <= 3 {
+	if this.GetPlayerNum() >= 1 {
+		logger.Logger.Trace("Clawdoll (*SceneEx) OnPlayerEnter, GetPlayerNum = ", this.GetPlayerNum())
 		// 发送http Get请求	恢复直播间流
 		//operateTask(this, 2, rule.Zego_ResumeRTCStream, p.Platform)
 	}
@@ -147,6 +148,7 @@ func (this *SceneEx) OnPlayerLeave(p *base.Player, reason int) {
 	}
 
 	if len(this.players) <= 0 {
+		logger.Logger.Trace("Clawdoll (*SceneEx) OnPlayerLeave, cur player num = ", len(this.players))
 		// 发送http Get请求	关闭直播间流
 		//operateTask(this, 2, rule.Zego_ForbidRTCStream, p.Platform)
 	}

From 68f0ac9f0654a99917f93d4b2cbaaf0ec238b77f Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Sat, 21 Sep 2024 17:44:30 +0800
Subject: [PATCH 3/3] proto

---
 protocol/bag/bag.pb.go | 2 +-
 protocol/bag/bag.proto | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/protocol/bag/bag.pb.go b/protocol/bag/bag.pb.go
index f3c9f12..3e8520e 100644
--- a/protocol/bag/bag.pb.go
+++ b/protocol/bag/bag.pb.go
@@ -1200,7 +1200,7 @@ type DillChangeLogInfo struct {
 
 	ItemId   int32  `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"`
 	ItemNum  int32  `protobuf:"varint,2,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"`
-	State    int32  `protobuf:"varint,3,opt,name=State,proto3" json:"State,omitempty"`
+	State    int32  `protobuf:"varint,3,opt,name=State,proto3" json:"State,omitempty"` //0待审核 1审核通过、2已发货、3审核不通过、4撤单
 	UserName string `protobuf:"bytes,4,opt,name=UserName,proto3" json:"UserName,omitempty"`
 	UserTel  string `protobuf:"bytes,5,opt,name=UserTel,proto3" json:"UserTel,omitempty"`
 	Addr     string `protobuf:"bytes,6,opt,name=Addr,proto3" json:"Addr,omitempty"`
diff --git a/protocol/bag/bag.proto b/protocol/bag/bag.proto
index 65ed7db..ada6940 100644
--- a/protocol/bag/bag.proto
+++ b/protocol/bag/bag.proto
@@ -148,7 +148,7 @@ message SCDillChangeLog{
 message DillChangeLogInfo{
 	int32 ItemId = 1;
 	int32 ItemNum = 2;
-	int32 State = 3;
+	int32 State = 3; //0待审核 1审核通过、2已发货、3审核不通过、4撤单
 	string UserName = 4;
 	string UserTel = 5;
 	string Addr = 6;