gamesrv/base/gamedetail.go

@@ -231,7 +231,6 @@ type LabaLog struct {
 	PlayerListLog *SaveGamePlayerListLogCopy
 	GameDetailLog *SaveGameDetailedCopy
 	CacheTime     time.Time // 缓存时间
-	noEmpty       bool
 }
 
 // Cache 临时缓存
@@ -239,30 +238,17 @@ func (l *LabaLog) Cache(s *Scene, detailLog *SaveGameDetailedParam, playerListLo
 	if s == nil {
 		return
 	}
-
-	l.Save(2) // 如果没有收到结束消息，算2秒游戏时长
-
 	detailLog.OnlyLog = true
 	playerListLog.OnlyLog = true
 	l.GameDetailLog = s.SaveGameDetailedLog(detailLog)
 	l.PlayerListLog = s.SaveGamePlayerListLog(playerListLog)
 	l.CacheTime = time.Now()
-	l.noEmpty = true
 }
 
 // Save 保存
-// second 为0时，自动计算时间,从开始转动计时
 func (l *LabaLog) Save(second int32) {
-	if !l.noEmpty {
-		return
-	}
 	if second <= 0 {
-		sub := time.Now().Sub(l.CacheTime).Milliseconds()
-		if sub <= 1000 {
-			second = 1
-		} else {
-			second = int32(sub / 1000)
-		}
+		second = int32(time.Now().Sub(l.CacheTime).Seconds())
 	}
 
 	if l.PlayerListLog != nil {
@@ -286,7 +272,6 @@ func (l *LabaLog) Save(second int32) {
 
 // Clear 清空
 func (l *LabaLog) Clear() {
-	l.noEmpty = false
 	l.PlayerListLog = nil
 	l.GameDetailLog = nil
 	l.CacheTime = time.Time{}

gamesrv/fortunedragon/playerdata_fortunedragon.go

@@ -8,7 +8,6 @@ import (
 
 type FortuneDragonPlayerData struct {
 	*base.Player
-	base.LabaLog
 	leaveTime    int32 //离开时间
 	SlotsSession *base.SlotsSession
 
@@ -32,7 +31,6 @@ func (p *FortuneDragonPlayerData) Clear() {
 	p.taxCoin = 0
 	p.winCoin = 0
 	p.currentLogId = ""
-	p.LabaLog.Clear()
 }
 
 // 需要带到world上进行数据处理

gamesrv/fortunedragon/scenepolicy_fortunedragon.go

@@ -112,7 +112,6 @@ func (this *ScenePolicyFortuneDragon) OnPlayerLeave(s *base.Scene, p *base.Playe
 	}
 	logger.Logger.Trace("(this *ScenePolicyFortuneDragon) OnPlayerLeave, sceneId=", s.GetSceneId(), " player=", p.SnId)
 	if playerEx, ok := p.ExtraData.(*FortuneDragonPlayerData); ok {
-		playerEx.Save(2)
 		m := playerEx.PushPlayer()
 		if m != nil && len(m) > 0 {
 			b, err := json.Marshal(m)
@@ -477,8 +476,6 @@ func (this *SceneStateStartFortuneDragon) OnPlayerOp(s *base.Scene, p *base.Play
 
 				// 记录本次操作
 				FortuneDragonAndSaveLog(sceneEx, playerEx, data)
-			case 1000:
-				playerEx.Save(0)
 			}
 		}
 	}
@@ -523,6 +520,11 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
 		if err == nil {
 			logid, _ := model.AutoIncGameLogId()
 			playerEx.currentLogId = logid
+			sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
+				LogId:    logid,
+				Detail:   info,
+				GameTime: 2,
+			})
 			var totalin, totalout int64
 			if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
 				totalin = playerEx.totalBet
@@ -530,10 +532,7 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
 			if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
 				totalout = int64(data.RoundReward) + playerEx.taxCoin
 			}
-			playerEx.Cache(sceneEx.Scene, &base.SaveGameDetailedParam{
-				LogId:  logid,
-				Detail: info,
-			}, &base.SaveGamePlayerListLogParam{
+			sceneEx.SaveGamePlayerListLog(&base.SaveGamePlayerListLogParam{
 				LogId:             logid,
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
@@ -545,6 +544,7 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
 				WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
 				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),
 				IsFree:            playerEx.isFree,
+				GameTime:          2,
 			})
 		}
 	}

gamesrv/fortunemouse/playerdata_fortunemouse.go

@@ -8,7 +8,6 @@ import (
 
 type FortuneMousePlayerData struct {
 	*base.Player
-	base.LabaLog
 	leaveTime    int32 //离开时间
 	SlotsSession *base.SlotsSession
 
@@ -38,7 +37,6 @@ func (p *FortuneMousePlayerData) Clear() {
 	p.taxCoin = 0
 	p.winCoin = 0
 	p.currentLogId = ""
-	p.LabaLog.Clear()
 }
 
 // 需要带到world上进行数据处理

gamesrv/fortunemouse/scenepolicy_fortunemouse.go

@@ -111,7 +111,6 @@ func (this *ScenePolicyFortuneMouse) OnPlayerLeave(s *base.Scene, p *base.Player
 	}
 	logger.Logger.Trace("(this *ScenePolicyFortuneMouse) OnPlayerLeave, sceneId=", s.GetSceneId(), " player=", p.SnId)
 	if playerEx, ok := p.ExtraData.(*FortuneMousePlayerData); ok {
-		playerEx.Save(2)
 		m := playerEx.PushPlayer()
 		if m != nil && len(m) > 0 {
 			b, err := json.Marshal(m)
@@ -481,8 +480,6 @@ func (this *SceneStateStartFortuneMouse) OnPlayerOp(s *base.Scene, p *base.Playe
 
 				// 记录本次操作
 				FortuneMouseAndSaveLog(sceneEx, playerEx, data)
-			case 1000:
-				playerEx.Save(0)
 			}
 		}
 	}
@@ -534,6 +531,11 @@ func FortuneMouseAndSaveLog(sceneEx *FortuneMouseSceneData, playerEx *FortuneMou
 		if err == nil {
 			logid, _ := model.AutoIncGameLogId()
 			playerEx.currentLogId = logid
+			sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
+				LogId:    logid,
+				Detail:   info,
+				GameTime: 2,
+			})
 			var totalin, totalout int64
 			if respinStatus == 0 || respinStatus == 1 {
 				totalin = playerEx.totalBet
@@ -541,10 +543,7 @@ func FortuneMouseAndSaveLog(sceneEx *FortuneMouseSceneData, playerEx *FortuneMou
 			if respinStatus == 0 || respinStatus == 3 {
 				totalout = int64(data.RoundReward) + playerEx.taxCoin
 			}
-			playerEx.Cache(sceneEx.Scene, &base.SaveGameDetailedParam{
-				LogId:  logid,
-				Detail: info,
-			}, &base.SaveGamePlayerListLogParam{
+			sceneEx.SaveGamePlayerListLog(&base.SaveGamePlayerListLogParam{
 				LogId:             logid,
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
@@ -552,10 +551,11 @@ func FortuneMouseAndSaveLog(sceneEx *FortuneMouseSceneData, playerEx *FortuneMou
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,
-				BetAmount:         totalin,
+				BetAmount:         playerEx.totalBet,
 				WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
 				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),
 				IsFree:            totalin == 0,
+				GameTime:          2,
 			})
 		}
 	}

gamesrv/fortuneox/playerdata_fortuneox.go

@@ -8,7 +8,6 @@ import (
 
 type FortuneOxPlayerData struct {
 	*base.Player
-	base.LabaLog
 	leaveTime    int32 //离开时间
 	SlotsSession *base.SlotsSession
 
@@ -38,7 +37,6 @@ func (p *FortuneOxPlayerData) Clear() {
 	p.taxCoin = 0
 	p.winCoin = 0
 	p.currentLogId = ""
-	p.LabaLog.Clear()
 }
 
 // 需要带到world上进行数据处理

gamesrv/fortuneox/scenepolicy_fortuneox.go

@@ -111,7 +111,6 @@ func (this *ScenePolicyFortuneOx) OnPlayerLeave(s *base.Scene, p *base.Player, r
 	}
 	logger.Logger.Trace("(this *ScenePolicyFortuneOx) OnPlayerLeave, sceneId=", s.GetSceneId(), " player=", p.SnId)
 	if playerEx, ok := p.ExtraData.(*FortuneOxPlayerData); ok {
-		playerEx.Save(2)
 		m := playerEx.PushPlayer()
 		if m != nil && len(m) > 0 {
 			b, err := json.Marshal(m)
@@ -481,8 +480,6 @@ func (this *SceneStateStartFortuneOx) OnPlayerOp(s *base.Scene, p *base.Player,
 
 				// 记录本次操作
 				FortuneOxAndSaveLog(sceneEx, playerEx, data)
-			case 1000:
-				playerEx.Save(0)
 			}
 		}
 	}
@@ -534,6 +531,11 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD
 		if err == nil {
 			logid, _ := model.AutoIncGameLogId()
 			playerEx.currentLogId = logid
+			sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
+				LogId:    logid,
+				Detail:   info,
+				GameTime: 2,
+			})
 			var totalin, totalout int64
 			if respinStatus == 0 || respinStatus == 1 {
 				totalin = playerEx.totalBet
@@ -541,10 +543,7 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD
 			if respinStatus == 0 || respinStatus == 3 {
 				totalout = int64(data.RoundReward) + playerEx.taxCoin
 			}
-			playerEx.Cache(sceneEx.Scene, &base.SaveGameDetailedParam{
-				LogId:  logid,
-				Detail: info,
-			}, &base.SaveGamePlayerListLogParam{
+			sceneEx.SaveGamePlayerListLog(&base.SaveGamePlayerListLogParam{
 				LogId:             logid,
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
@@ -556,6 +555,7 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD
 				WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
 				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),
 				IsFree:            totalin == 0,
+				GameTime:          2,
 			})
 		}
 	}

gamesrv/fortunerabbit/playerdata_fortunerabbit.go

@@ -8,7 +8,6 @@ import (
 
 type FortuneRabbitPlayerData struct {
 	*base.Player
-	base.LabaLog
 	leaveTime    int32 //离开时间
 	SlotsSession *base.SlotsSession
 
@@ -32,7 +31,6 @@ func (p *FortuneRabbitPlayerData) Clear() {
 	p.taxCoin = 0
 	p.winCoin = 0
 	p.currentLogId = ""
-	p.LabaLog.Clear()
 }
 
 // 需要带到world上进行数据处理

gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go

@@ -111,7 +111,6 @@ func (this *ScenePolicyFortuneRabbit) OnPlayerLeave(s *base.Scene, p *base.Playe
 	}
 	logger.Logger.Trace("(this *ScenePolicyFortuneRabbit) OnPlayerLeave, sceneId=", s.GetSceneId(), " player=", p.SnId)
 	if playerEx, ok := p.ExtraData.(*FortuneRabbitPlayerData); ok {
-		playerEx.LabaLog.Save(2) // 没有收到结束消息，算2秒游戏时长
 		m := playerEx.PushPlayer()
 		if m != nil && len(m) > 0 {
 			b, err := json.Marshal(m)
@@ -475,9 +474,6 @@ func (this *SceneStateStartFortuneRabbit) OnPlayerOp(s *base.Scene, p *base.Play
 
 				// 记录本次操作
 				FortuneRabbitAndSaveLog(sceneEx, playerEx, data)
-
-			case 1000:
-				playerEx.Save(0)
 			}
 		}
 	}
@@ -522,6 +518,11 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
 		if err == nil {
 			logid, _ := model.AutoIncGameLogId()
 			playerEx.currentLogId = logid
+			sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
+				LogId:    logid,
+				Detail:   info,
+				GameTime: 2,
+			})
 			var totalin, totalout int64
 			if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
 				totalin = playerEx.totalBet
@@ -529,10 +530,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
 			if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
 				totalout = int64(data.RoundReward) + playerEx.taxCoin
 			}
-			playerEx.Cache(sceneEx.Scene, &base.SaveGameDetailedParam{
-				LogId:  logid,
-				Detail: info,
-			}, &base.SaveGamePlayerListLogParam{
+			sceneEx.SaveGamePlayerListLog(&base.SaveGamePlayerListLogParam{
 				LogId:             logid,
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
@@ -544,6 +542,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
 				WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
 				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),
 				IsFree:            playerEx.isFree,
+				GameTime:          2,
 			})
 		}
 	}

gamesrv/fortunetiger/playerdata_fortunetiger.go

@@ -8,7 +8,6 @@ import (
 
 type FortuneTigerPlayerData struct {
 	*base.Player
-	base.LabaLog
 	leaveTime    int32 //离开时间
 	SlotsSession *base.SlotsSession
 
@@ -41,7 +40,6 @@ func (p *FortuneTigerPlayerData) Clear() {
 	p.taxCoin = 0
 	p.winCoin = 0
 	p.currentLogId = ""
-	p.LabaLog.Clear()
 }
 
 // 需要带到world上进行数据处理

gamesrv/fortunetiger/scenepolicy_fortunetiger.go

@@ -111,7 +111,6 @@ func (this *ScenePolicyFortuneTiger) OnPlayerLeave(s *base.Scene, p *base.Player
 	}
 	logger.Logger.Trace("(this *ScenePolicyFortuneTiger) OnPlayerLeave, sceneId=", s.GetSceneId(), " player=", p.SnId)
 	if playerEx, ok := p.ExtraData.(*FortuneTigerPlayerData); ok {
-		playerEx.LabaLog.Save(2) // 没有收到结束消息，算2秒游戏时长
 		m := playerEx.PushPlayer()
 		if m != nil && len(m) > 0 {
 			b, err := json.Marshal(m)
@@ -481,9 +480,6 @@ func (this *SceneStateStartFortuneTiger) OnPlayerOp(s *base.Scene, p *base.Playe
 
 				// 记录本次操作
 				FortuneTigerAndSaveLog(sceneEx, playerEx, data)
-
-			case 1000:
-				playerEx.Save(0)
 			}
 		}
 	}
@@ -535,6 +531,11 @@ func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTig
 		if err == nil {
 			logid, _ := model.AutoIncGameLogId()
 			playerEx.currentLogId = logid
+			sceneEx.SaveGameDetailedLog(&base.SaveGameDetailedParam{
+				LogId:    logid,
+				Detail:   info,
+				GameTime: 2,
+			})
 			var totalin, totalout int64
 			if data.Results[0].FreeStatus == 1 || data.Results[0].FreeNumMax == 0 {
 				totalin = playerEx.totalBet
@@ -542,10 +543,7 @@ func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTig
 			if data.Results[0].FreeStatus == 3 || data.Results[0].FreeNumMax == 0 {
 				totalout = int64(data.RoundReward) + playerEx.taxCoin
 			}
-			playerEx.Cache(sceneEx.Scene, &base.SaveGameDetailedParam{
-				LogId:  logid,
-				Detail: info,
-			}, &base.SaveGamePlayerListLogParam{
+			sceneEx.SaveGamePlayerListLog(&base.SaveGamePlayerListLogParam{
 				LogId:             logid,
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
@@ -557,6 +555,7 @@ func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTig
 				WinAmountNoAnyTax: totalout - totalin - playerEx.taxCoin,
 				IsFirstGame:       sceneEx.IsPlayerFirst(playerEx.Player),
 				IsFree:            totalin == 0,
+				GameTime:          2,
 			})
 		}
 	}

statistics/modelmysql/log_login.go

@@ -9,13 +9,13 @@ const (
 )
 
 type LogLogin struct {
-	ID          uint      `gorm:"primaryKey"`
-	Snid        int       `gorm:"index"`
-	OnlineType  int       `gorm:"index"`
-	OnlineTs    int64     `gorm:"index"`
+	ID         uint `gorm:"primaryKey"`
+	Snid       int  `gorm:"index"`
+	OnlineType int  `gorm:"index"`
+	//OnlineTs    int       `gorm:"index"`
 	OnlineTime  time.Time `gorm:"index"`
 	OfflineType int       `gorm:"index"`
-	OfflineTs   int64     `gorm:"index"`
+	//OfflineTs   int       `gorm:"index"`
 	OfflineTime time.Time `gorm:"index"`
 	ChannelId   string    `gorm:"index"` // 推广渠道
 

statistics/modelmysql/tables.go

@@ -8,8 +8,8 @@ var Tables = []interface{}{
 	&LogLogin{},
 	&LogLoginMid{},
 	&UserAccount{},
-	//&UserLogin{},
-	//&UserID{},
+	&UserLogin{},
+	&UserID{},
 	&LogInviteScoreMid{},
 	&LogInviteScore{},
 	&LogInviteUser{},

statistics/modelmysql/user_account.go

@@ -8,7 +8,6 @@ type UserAccount struct {
 	Snid int `gorm:"index"`
 	//RegisterTs   int       `gorm:"index"`
 	RegisterTime time.Time `gorm:"index"`
-	RegisterTs   int64     `gorm:"index"`
 	ChannelId    string    `gorm:"index"` // 推广渠道
 
 	DeviceName   string `gorm:"index"`

statistics/syn/log_login.go

@@ -91,12 +91,12 @@ func LogLogin(platform string, batchSize int) ([]*mysqlmodel.LogLogin, error) {
 
 			if n == 0 {
 				e = &mysqlmodel.LogLogin{
-					Snid:         int(v.SnId),
-					OnlineType:   onlineType,
-					OnlineTs:     v.Time.Unix(),
-					OnlineTime:   v.Time,
-					OfflineType:  0,
-					OfflineTs:    0,
+					Snid:       int(v.SnId),
+					OnlineType: onlineType,
+					//OnlineTs:     int(v.Ts),
+					OnlineTime:  v.Time,
+					OfflineType: 0,
+					//OfflineTs:    0,
 					OfflineTime:  v.Time,
 					DeviceName:   v.DeviceName,
 					AppVersion:   v.AppVersion,
@@ -132,7 +132,7 @@ func LogLogin(platform string, batchSize int) ([]*mysqlmodel.LogLogin, error) {
 			}
 
 			e.OfflineType = mysqlmodel.LogTypeOffline
-			e.OfflineTs = v.Time.Unix()
+			//e.OfflineTs = int(v.Ts)
 			e.OfflineTime = v.Time
 			if err = db.Model(e).Select("OfflineType", "OfflineTime").Updates(e).Error; err != nil {
 				logger.Logger.Errorf("mysql: SyncLogLogin failed to update log_login: %v", err)

statistics/syn/user_account.go

@@ -68,9 +68,9 @@ func UserAccount(platform string, batchSize int) ([]*mysqlmodel.UserAccount, err
 		for _, v := range accounts {
 			logger.Logger.Tracef("mongo account: %+v", *v)
 			a := &mysqlmodel.UserAccount{
-				MID:          v.AccountId.Hex(),
-				Snid:         int(v.SnId),
-				RegisterTs:   v.RegisteTime.Unix(),
+				MID:  v.AccountId.Hex(),
+				Snid: int(v.SnId),
+				//RegisterTs:   int(v.RegisterTs),
 				RegisterTime: v.RegisteTime,
 				Tel:          v.Tel,
 				ChannelId:    v.ChannelId,
@@ -81,17 +81,17 @@ func UserAccount(platform string, batchSize int) ([]*mysqlmodel.UserAccount, err
 				return err
 			}
 
-			//if err = tx.First(&mysqlmodel.UserID{}, "snid = ?", v.SnId).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			//	logger.Logger.Errorf("mysql: UserAccount failed to find user_id: %v", err)
-			//	return err
-			//}
-			//
-			//if errors.Is(err, gorm.ErrRecordNotFound) {
-			//	if err = tx.Create(&mysqlmodel.UserID{Snid: int(v.SnId)}).Error; err != nil {
-			//		logger.Logger.Errorf("mysql: UserAccount failed to create user_id: %v", err)
-			//		return err
-			//	}
-			//}
+			if err = tx.First(&mysqlmodel.UserID{}, "snid = ?", v.SnId).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+				logger.Logger.Errorf("mysql: UserAccount failed to find user_id: %v", err)
+				return err
+			}
+
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				if err = tx.Create(&mysqlmodel.UserID{Snid: int(v.SnId)}).Error; err != nil {
+					logger.Logger.Errorf("mysql: UserAccount failed to create user_id: %v", err)
+					return err
+				}
+			}
 
 			as = append(as, a)
 		}