Merge branch 'ma' into develop

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

@@ -1688,4 +1688,5 @@ type ClawdollResultType struct {
 	BeforeClawdollItemNum int64  //变化前娃娃币
 	AfterClawdollItemNum  int64  //变化后娃娃币
 	IsWin                 bool   //是否成功
+	Channel               string //渠道
 }