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

gamesrv/base/scene.go

@@ -1993,8 +1993,13 @@ func (this *Scene) TryBillExGameDrop(p *Player) {
 				itemData := srvdata.GameItemMgr.Get(p.Platform, id)
 				if itemData != nil {
 					p.AddItems(&model.AddItemParam{
-						P:          p.PlayerData,
+						P: p.PlayerData,
-						Change:     nil,
+						Change: []*model.Item{
+							{
+								ItemId:  id,
+								ItemNum: int64(num),
+							},
+						},
 						GainWay:    common.GainWay_Game,
 						Operator:   "system",
 						Remark:     fmt.Sprintf("游戏掉落%v", id),

gamesrv/clawdoll/scenepolicy_clawdoll.go

@@ -767,6 +767,7 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 		LogBaseResult.BeforeClawdollItemNum = curClawdollItemNum + int64(machineInfo.CostItemNum)
 		LogBaseResult.AfterClawdollItemNum = curClawdollItemNum
 		LogBaseResult.IsWin = playerEx.IsWin
+		LogBaseResult.Channel = playerEx.Channel
 
 		if !playerEx.IsRob {
 			sceneEx.logid, _ = model.AutoIncGameLogId()

model/gamelogtype.go

@@ -1683,9 +1683,10 @@ type SamLocPerson struct {
 // 娃娃机 每局记录
 type ClawdollResultType struct {
 	//all
-	RoomId                int32 //房间Id
+	RoomId                int32  //房间Id
-	PlayerSnid            int32 //玩家id
+	PlayerSnid            int32  //玩家id
-	BeforeClawdollItemNum int64 //变化前娃娃币
+	BeforeClawdollItemNum int64  //变化前娃娃币
-	AfterClawdollItemNum  int64 //变化后娃娃币
+	AfterClawdollItemNum  int64  //变化后娃娃币
-	IsWin                 bool  //是否成功
+	IsWin                 bool   //是否成功
+	Channel               string //渠道
 }