tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into dev_slots

This commit is contained in:
tomas 2024-09-23 08:59:21 +08:00
parent 0fb29e2750 68f0ac9f06
commit d5d3c225f2
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gamesrv/clawdoll/scene_clawdoll.go
View File

@ -129,7 +129,8 @@ func (this *SceneEx) OnPlayerEnter(p *base.Player, reason int) {
return return
} }
if this.GetPlayerNum() >= 1 && this.GetPlayerNum() <= 3 { if this.GetPlayerNum() >= 1 {
logger.Logger.Trace("Clawdoll (*SceneEx) OnPlayerEnter, GetPlayerNum = ", this.GetPlayerNum())
// 发送http Get请求 恢复直播间流 // 发送http Get请求 恢复直播间流
//operateTask(this, 2, rule.Zego_ResumeRTCStream, p.Platform) //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 { if len(this.players) <= 0 {
logger.Logger.Trace("Clawdoll (*SceneEx) OnPlayerLeave, cur player num = ", len(this.players))
// 发送http Get请求 关闭直播间流 // 发送http Get请求 关闭直播间流
//operateTask(this, 2, rule.Zego_ForbidRTCStream, p.Platform) //operateTask(this, 2, rule.Zego_ForbidRTCStream, p.Platform)
} }

2
protocol/bag/bag.pb.go
View File

@ -1200,7 +1200,7 @@ type DillChangeLogInfo struct {
ItemId int32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"` ItemId int32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"`
ItemNum int32 `protobuf:"varint,2,opt,name=ItemNum,proto3" json:"ItemNum,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"` UserName string `protobuf:"bytes,4,opt,name=UserName,proto3" json:"UserName,omitempty"`
UserTel string `protobuf:"bytes,5,opt,name=UserTel,proto3" json:"UserTel,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"` Addr string `protobuf:"bytes,6,opt,name=Addr,proto3" json:"Addr,omitempty"`

2
protocol/bag/bag.proto
View File

@ -148,7 +148,7 @@ message SCDillChangeLog{
message DillChangeLogInfo{ message DillChangeLogInfo{
int32 ItemId = 1; int32 ItemId = 1;
int32 ItemNum = 2; int32 ItemNum = 2;
int32 State = 3; int32 State = 3; //0待审核 1审核通过、2已发货、3审核不通过、4撤单
string UserName = 4; string UserName = 4;
string UserTel = 5; string UserTel = 5;
string Addr = 6; string Addr = 6;

6
worldsrv/action_bag.go
View File

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