Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

gamesrv/fortunedragon/scenepolicy_fortunedragon.go

@@ -409,6 +409,7 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
 				if err == nil {
 					s.SetGameNowTime(time.Now())
 					data = assemble.DataToCli(Response).(assemble.GameEnd)
+					data.Results[0].BetMode = playerEx.BetMode
 					if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
 						//logger.Logger.Trace("=====================AddCoin=====TotalBet===", -data.TotalBet)
 						//第一次触发或者正常模式

gamesrv/fortunemouse/scenepolicy_fortunemouse.go

@@ -405,6 +405,7 @@ func (this *SceneStateStartFortuneMouse) OnPlayerOp(s *base.Scene, p *base.Playe
 				var gameEndStr string
 				var data assemble.GameEnd
 				if err == nil {
+					s.SetGameNowTime(time.Now())
 					data = assemble.DataToCli(Response).(assemble.GameEnd)
 					var respinStatus int
 					if data.Results[0].ArrSpins[0].Special != nil {
@@ -524,7 +525,11 @@ func FortuneMouseAndSaveLog(sceneEx *FortuneMouseSceneData, playerEx *FortuneMou
 		if err == nil {
 			logid, _ := model.AutoIncGameLogId()
 			playerEx.currentLogId = logid
-			sceneEx.SaveGameDetailedLog(logid, info, &base.GameDetailedParam{})
+			sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
+				LogId:    logid,
+				Detail:   info,
+				GameTime: 2,
+			})
 			var totalin, totalout int64
 			if respinStatus == 0 || respinStatus == 1 {
 				totalin = playerEx.totalBet
@@ -532,25 +537,22 @@ func FortuneMouseAndSaveLog(sceneEx *FortuneMouseSceneData, playerEx *FortuneMou
 			if respinStatus == 0 || respinStatus == 3 {
 				totalout = int64(data.RoundReward) + playerEx.taxCoin
 			}
-			validFlow := totalin + totalout
+			sceneEx.SaveGamePlayerListLog(&base.SaveGamePlayerListLogParam{
-			validBet := common.AbsI64(totalin - totalout)
-			logParam := &base.SaveGamePlayerListLogParam{
-				Platform:          playerEx.Platform,
-				Channel:           playerEx.Channel,
-				Promoter:          playerEx.BeUnderAgentCode,
-				PackageTag:        playerEx.PackageID,
-				InviterId:         playerEx.InviterId,
 				LogId:             logid,
+				Platform:          playerEx.Platform,
+				Snid:              playerEx.SnId,
+				PlayerName:        playerEx.Name,
+				Channel:           playerEx.Channel,
+				ChannelId:         playerEx.ChannelId,
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,
 				BetAmount:         playerEx.totalBet,
 				WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
-				ValidBet:          validBet,
-				ValidFlow:         validFlow,
 				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),
-			}
+				IsFree:            totalin == 0,
-			sceneEx.SaveGamePlayerListLog(playerEx.SnId, logParam)
+				GameTime:          2,
+			})
 		}
 	}
 

gamesrv/fortunetiger/scenepolicy_fortunetiger.go

@@ -409,7 +409,10 @@ func (this *SceneStateStartFortuneTiger) OnPlayerOp(s *base.Scene, p *base.Playe
 					data = assemble.DataToCli(Response).(assemble.GameEnd)
 					var respinStatus int
 					if data.Results[0].ArrSpins[0].Special != nil {
-						respinStatus = data.Results[0].ArrSpins[0].Special.(SpinLock).ReSpinStatus
+						sp, _ := json.Marshal(data.Results[0].ArrSpins[0].Special)
+						var spinLock SpinLock
+						json.Unmarshal(sp, &spinLock)
+						respinStatus = spinLock.ReSpinStatus
 					}
 					if respinStatus == 0 || respinStatus == 1 {
 						//第一次触发或者正常模式

gamesrv/main.go

@@ -31,6 +31,7 @@ import (
 	_ "mongo.games.com/game/gamesrv/caishen"
 	_ "mongo.games.com/game/gamesrv/easterisland"
 	_ "mongo.games.com/game/gamesrv/fortunedragon"
+	_ "mongo.games.com/game/gamesrv/fortunemouse"
 	_ "mongo.games.com/game/gamesrv/fortuneox"
 	_ "mongo.games.com/game/gamesrv/fortunerabbit"
 	_ "mongo.games.com/game/gamesrv/fortunetiger"