.gitignore

@@ -47,5 +47,3 @@ tools/xlsx2binary/agc.go
 /ranksrv/ranksrv
 /schedulesrv/schedulesrv
 /machine/machine
-/statistics/statistics
-/statistics/task/task*

bin/build.bat

@@ -1,8 +1,8 @@
 @echo off
 
-xcopy ..\data\* .\data\ /s /e /y /exclude:..\exclude.txt
+xcopy ..\data\* .\data\ /s /e /y /exclude:..\shell\exclude.txt
 
-for /f %%i in (../programs.txt) do (
+for /f %%i in (../shell/programs.txt) do (
     echo go build %%i
     go build -o ./%%i/%%i.exe ../%%i/
 )

common/constant.go

@@ -898,7 +898,3 @@ var GuideIdToGainWay = map[int]int{
 	GuideIdNewPlayer: GainWayGuide,
 	GuideIdCustom:    GainWayGuide2,
 }
-
-func GetGameDifKey(gamedif string) string {
-	return fmt.Sprintf("gamedif-%v", gamedif)
-}

dbproxy/svc/l_dbshoplog.go

@@ -64,10 +64,10 @@ func (svc *DbShopLogSvc) UpdateDbShopState(args *model.DbShopLogArgs, ret *bool)
 		logger.Logger.Error("UpdateDbShopState  == nil")
 		return nil
 	}
-	logger.Logger.Info("DbShopLogSvc.UpdateDbShopState", args.Log.LogId)
+	logger.Logger.Trace("DbShopLogSvc.UpdateDbShopState")
 	err = clog.UpdateId(args.Log.LogId, bson.M{"$set": bson.M{"state": args.Log.State}})
 	if err != nil {
-		logger.Logger.Error("DbShopLogSvc.UpdateDbShopState error:", err, "LogId = ", args.Log.LogId)
+		logger.Logger.Error("DbShopLogSvc.UpdateDbShopState error:", err)
 		return nil
 	}
 	*ret = true

dbproxy/svc/l_gamedetailed.go

@@ -33,7 +33,6 @@ func GameDetailedLogsCollection(plt string) *mongo.Collection {
 			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"ts", "cycleid"}, Background: true, Sparse: true})
 			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"time", "cycleid"}, Background: true, Sparse: true})
 			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-time", "cycleid"}, Background: true, Sparse: true})
-			c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"gamedif"}, Background: true, Sparse: true})
 		}
 		return c_gamedetailed
 	}

dbproxy/svc/l_gameplayerlistlog.go

@@ -44,7 +44,6 @@ func GamePlayerListLogsCollection(plt string) *mongo.Collection {
 			c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-ts", "cycleid"}, Background: true, Sparse: true})
 			c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"cycleid"}, Background: true, Sparse: true})
 			c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"ts", "cycleid"}, Background: true, Sparse: true})
-			c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"gamedif"}, Background: true, Sparse: true})
 		}
 		return c_gameplayerlistlog
 	}

dbproxy/svc/l_itemlog.go

@@ -30,7 +30,6 @@ func ItemLogsCollection(plt string) *mongo.Collection {
 			c_itemlog.EnsureIndex(mgo.Index{Key: []string{"typeid", "roomconfigid"}, Background: true, Sparse: true})
 			c_itemlog.EnsureIndex(mgo.Index{Key: []string{"ts"}, Background: true, Sparse: true})
 			c_itemlog.EnsureIndex(mgo.Index{Key: []string{"-ts"}, Background: true, Sparse: true})
-			c_itemlog.EnsureIndex(mgo.Index{Key: []string{"gamedif"}, Background: true, Sparse: true})
 		}
 		return c_itemlog
 	}

etcd/keyconf.go

@@ -42,8 +42,8 @@ const (
 	ETCDKEY_MACHINE             = "/game/machine_config"    //娃娃机配置
 	ETCDKEY_MatchAudience       = "/game/match_audience"    //比赛观众
 	ETCDKEY_Spirit              = "/game/spirit"            // 小精灵配置
-	ETCDKEY_RoomType            = "/game/room_type/"        // 房间类型配置
+	ETCDKEY_RoomType            = "/game/room_type"         // 房间类型配置
-	ETCDKEY_RoomConfig          = "/game/room_config/"      // 房间配置
+	ETCDKEY_RoomConfig          = "/game/room_config"       // 房间配置
 	ETCDKEY_RoomConfigSystem    = "/game/room_system"       // 系统房间配置
 	ETCDKEY_ClientUpgrade       = "/game/client_upgrade"    // 客户端升级奖励配置
 	ETCDKEY_PopUpWindow         = "/game/PopUpWindowConfig" //弹窗配置

gamesrv/avengers/scenepolicy_avengers.go

@@ -945,6 +945,8 @@ func AvengersCheckAndSaveLog(sceneEx *AvengersSceneData, playerEx *AvengersPlaye
 					LogId:             logid,
 					Platform:          playerEx.Platform,
 					Snid:              playerEx.SnId,
+					Channel:           playerEx.Channel,
+					ChannelId:         playerEx.ChannelId,
 					TotalIn:           totalin,
 					TotalOut:          totalout,
 					TaxCoin:           playerEx.taxCoin,

gamesrv/base/gamedetail.go

@@ -44,16 +44,13 @@ func (this *Scene) SaveGameDetailedLog(param *SaveGameDetailedParam) *SaveGameDe
 	f := func(plt string) {
 		log := &model.GameDetailedLog{
 			Id:               bson.NewObjectId(),
-			Platform:         plt,
 			LogId:            param.LogId,
-			GameDif:          this.GetDBGameFree().GetGameDif(),
+			GameId:           this.GameId,
-			GameId:           this.GetDBGameFree().GetGameId(),
+			Platform:         plt,
-			GameClass:        this.GetDBGameFree().GetGameClass(),
-			GameMode:         this.GetDBGameFree().GetGameMode(),
-			GameType:         this.GetDBGameFree().GetGameType(),
-			GameFreeId:       this.GetDBGameFree().GetId(),
 			MatchId:          this.GetMatch().GetMatchSortId(),
 			SceneId:          this.SceneId,
+			GameMode:         this.GameMode,
+			GameFreeid:       this.GetGameFreeId(),
 			PlayerCount:      int32(len(this.Players)),
 			GameTiming:       int32(param.GameTime),
 			GameBaseBet:      this.GetBaseScore(),
@@ -101,6 +98,8 @@ type SaveGamePlayerListLogParam struct {
 	Platform          string // 平台
 	Snid              int32  // 玩家id
 	PlayerName        string // 玩家名字
+	Channel           string // 渠道
+	ChannelId         string // 推广渠道
 	TotalIn           int64  // 总投入
 	TotalOut          int64  // 总产出(税前)
 	TaxCoin           int64  // 总税收
@@ -156,35 +155,33 @@ func (this *Scene) SaveGamePlayerListLog(param *SaveGamePlayerListLogParam) *Sav
 	now := time.Now()
 	log := &model.GamePlayerListLog{
 		LogId:             bson.NewObjectId(),
-		Platform:          param.Platform,
-		GameDif:           this.GetDBGameFree().GetGameDif(),
-		GameId:            this.GetDBGameFree().GetGameId(),
-		GameClass:         this.GetDBGameFree().GetGameClass(),
-		GameMode:          this.GetDBGameFree().GetGameMode(),
-		GameType:          this.GetDBGameFree().GetGameType(),
-		GameFreeId:        this.GetGameFreeId(),
-		BaseScore:         baseScore,
-		GameDetailedLogId: param.LogId,
-		Channel:           p.Channel,
-		ChannelId:         p.ChannelId,
-		RoomType:          this.SceneMode,
-		Ts:                now.Unix(),
-		Time:              now,
-		CycleId:           this.CycleID,
 		SnId:              p.SnId,
 		Name:              param.PlayerName,
-		SceneId:           this.SceneId,
+		GameId:            this.GameId,
-		MatchId:           this.GetMatch().GetMatchSortId(),
+		BaseScore:         baseScore,
-		MatchType:         int64(this.GetMatch().GetMatchType()),
-		WinAmountNoAnyTax: param.WinAmountNoAnyTax,
 		TaxCoin:           param.TaxCoin,
-		BetAmount:         param.BetAmount,
+		Platform:          param.Platform,
+		Channel:           param.Channel,
+		SceneId:           this.SceneId,
+		GameMode:          this.GameMode,
+		GameFreeid:        this.GetGameFreeId(),
+		GameDetailedLogId: param.LogId,
 		IsFirstGame:       param.IsFirstGame,
+		BetAmount:         param.BetAmount,
+		WinAmountNoAnyTax: param.WinAmountNoAnyTax,
 		TotalIn:           param.TotalIn,
 		TotalOut:          param.TotalOut,
+		Time:              now,
+		RoomType:          this.SceneMode,
+		GameDif:           this.GetDBGameFree().GetGameDif(),
+		GameClass:         this.GetDBGameFree().GetGameClass(),
+		MatchId:           this.GetMatch().GetMatchSortId(),
+		MatchType:         int64(this.GetMatch().GetMatchType()),
+		Ts:                now.Unix(),
 		IsFree:            param.IsFree,
 		WinSmallGame:      param.WinSmallGame,
 		WinTotal:          param.WinTotal,
+		CycleId:           this.CycleID,
 	}
 	if param.OnlyLog {
 		ret.Log = append(ret.Log, log)
@@ -226,11 +223,10 @@ func (s *SaveGameDetailedCopy) Save() {
 	}
 }
 
-// LabaLog 拉霸缓存游戏记录,为了统计游戏时长
+// LabaLog 拉霸缓存游戏记录
 type LabaLog struct {
 	PlayerListLog *SaveGamePlayerListLogCopy
 	GameDetailLog *SaveGameDetailedCopy
-	CacheTime     time.Time // 缓存时间
 }
 
 // Cache 临时缓存
@@ -242,31 +238,13 @@ func (l *LabaLog) Cache(s *Scene, detailLog *SaveGameDetailedParam, playerListLo
 	playerListLog.OnlyLog = true
 	l.GameDetailLog = s.SaveGameDetailedLog(detailLog)
 	l.PlayerListLog = s.SaveGamePlayerListLog(playerListLog)
-	l.CacheTime = time.Now()
 }
 
 // Save 保存
-func (l *LabaLog) Save(second int32) {
+func (l *LabaLog) Save(f func(log *LabaLog)) {
-	if second <= 0 {
+	f(l)
-		second = int32(time.Now().Sub(l.CacheTime).Seconds())
+	l.PlayerListLog.Save()
-	}
+	l.GameDetailLog.Save()
-
-	if l.PlayerListLog != nil {
-		if l.PlayerListLog.UpLog != nil {
-			for _, v := range l.PlayerListLog.UpLog.Log {
-				v.GamingTime = second
-			}
-		}
-		l.PlayerListLog.Save()
-	}
-
-	if l.GameDetailLog != nil {
-		for _, v := range l.GameDetailLog.Log {
-			v.GameTiming = second
-		}
-		l.GameDetailLog.Save()
-	}
-
 	l.Clear()
 }
 
@@ -274,5 +252,4 @@ func (l *LabaLog) Save(second int32) {
 func (l *LabaLog) Clear() {
 	l.PlayerListLog = nil
 	l.GameDetailLog = nil
-	l.CacheTime = time.Time{}
 }

gamesrv/base/player.go

@@ -7,7 +7,6 @@ import (
 	"math/rand"
 	"time"
 
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	rawproto "google.golang.org/protobuf/proto"
 	"mongo.games.com/goserver/core/logger"
 	"mongo.games.com/goserver/core/netlib"
@@ -638,19 +637,19 @@ type ReportGameEventOnly struct {
 
 func (this *Player) ReportGameEvent(param *ReportGameEventParam) *ReportGameEventOnly {
 	// 记录玩家 首次参与该场次的游戏时间 游戏次数
-	var gameFirstTime, gameFreeFirstTime, gamedifFirstTime time.Time
+	var gameFirstTime, gameFreeFirstTime time.Time
-	var gameTimes, gameFreeTimes, gamedifTimes int64
+	var gameTimes, gameFreeTimes int64
 	data, ok := this.GDatas[this.scene.KeyGamefreeId]
 	if ok {
-		gameFreeFirstTime = data.FirstTime
+		gameFirstTime = data.FirstTime
-		gameFreeTimes = data.Statics.GameTimes
+		gameTimes = data.Statics.GameTimes
 	}
 
 	// 记录玩家 首次参与该游戏时间 游戏次数(不区分场次)
 	dataGame, ok := this.GDatas[this.scene.KeyGameId]
 	if ok {
-		gameFirstTime = dataGame.FirstTime
+		gameFreeFirstTime = dataGame.FirstTime
-		gameTimes = dataGame.Statics.GameTimes
+		gameFreeTimes = dataGame.Statics.GameTimes
 	}
 
 	isNew := int32(0)
@@ -659,7 +658,7 @@ func (this *Player) ReportGameEvent(param *ReportGameEventParam) *ReportGameEven
 		isNew = 1
 	}
 
-	if param.GameTime <= 0 {
+	if param.GameTime < 0 {
 		param.GameTime = int64(time.Now().Sub(this.scene.GameNowTime).Seconds())
 	}
 	if param.GameTime < 0 {
@@ -669,32 +668,30 @@ func (this *Player) ReportGameEvent(param *ReportGameEventParam) *ReportGameEven
 	var ret ReportGameEventOnly
 	ret.Param = param
 	log := &model.PlayerGameRecEvent{
-		Id:               primitive.NewObjectID().Hex(),
+		Platform:      this.Platform,
-		RecordId:         this.scene.GetRecordId(),
+		RecordId:      this.scene.GetRecordId(),
-		SnId:             this.GetSnId(),
+		SnId:          this.GetSnId(),
-		Channel:          this.Channel,
+		Channel:       this.Channel,
-		Platform:         this.Platform,
+		ChannelId:     this.ChannelId,
-		OS:               this.DeviceOS,
+		City:          this.City,
-		GameId:           this.scene.GameId,
+		OS:            this.DeviceOS,
-		ModeId:           this.scene.GameMode,
+		GameId:        this.scene.GameId,
-		Tax:              param.Tax,
+		ModeId:        this.scene.GameMode,
-		Amount:           param.Change,
+		Tax:           param.Tax,
-		CreateTime:       time.Now().Unix(),
+		Amount:        param.Change,
-		CreateDayTime:    tCreateDay.Unix(),
+		CreateTime:    this.CreateTime.Unix(),
-		Out:              param.Out,
+		CreateDayTime: tCreateDay.Unix(),
-		In:               param.In,
+		Out:           param.Out,
-		IsNew:            isNew,
+		In:            param.In,
-		GameFreeID:       this.scene.GetGameFreeId(),
+		IsNew:         isNew,
-		GamingTime:       int32(param.GameTime),
+		GameFreeID:    this.scene.GetGameFreeId(),
-		GameDif:          this.scene.GetDBGameFree().GetGameDif(),
+		GamingTime:    int32(param.GameTime),
-		FirstGameDifTime: gamedifFirstTime.Unix(),
+		FirstTime:     gameFirstTime.Unix(),
-		GameDifTimes:     gamedifTimes,
+		PlayTimes:     gameTimes,
-		FirstTime:        gameFreeFirstTime.Unix(),
+		FirstGameTime: gameFreeFirstTime.Unix(),
-		PlayTimes:        gameFreeTimes,
+		PlayGameTimes: gameFreeTimes,
-		FirstGameTime:    gameFirstTime.Unix(),
+		LastLoginTime: this.LastLoginTime.Unix(),
-		PlayGameTimes:    gameTimes,
+		DeviceId:      this.DeviceId,
-		LastLoginTime:    this.LastLoginTime.Unix(),
-		ChannelId:        this.ChannelId,
 	}
 	if param.OnlyLog {
 		ret.Log = append(ret.Log, log)

gamesrv/base/scene.go

@@ -2057,7 +2057,6 @@ func (this *Scene) IsControl(hasRobotGaming bool) bool {
 
 // Statistics 玩家游戏数据统计
 // 包含水池统计，黑白名单统计，新手调控统计，个人水池统计
-// 拉霸游戏数据统计,一次下注记录一次 StaticsLaba
 func (this *Scene) Statistics(param *StaticParam) {
 	if param == nil {
 		return
@@ -2111,7 +2110,6 @@ func (this *Scene) Statistics(param *StaticParam) {
 	var statics []*model.PlayerGameStatics
 	keyGameId := strconv.Itoa(this.GetGameId())
 	keyGameFreeId := strconv.Itoa(int(this.GetGameFreeId()))
-	keyGameDif := common.GetGameDifKey(this.GetDBGameFree().GetGameDif())
 	// 当天数据统计
 	// 按场次分
 	if data, ok := p.TodayGameData.CtrlData[keyGameFreeId]; ok {
@@ -2129,14 +2127,6 @@ func (this *Scene) Statistics(param *StaticParam) {
 		p.TodayGameData.CtrlData[keyGameId] = data
 		statics = append(statics, data)
 	}
-	// 按游戏组分
-	if data, ok := p.TodayGameData.CtrlData[keyGameDif]; ok {
-		statics = append(statics, data)
-	} else {
-		data = model.NewPlayerGameStatics()
-		p.TodayGameData.CtrlData[keyGameDif] = data
-		statics = append(statics, data)
-	}
 	// 按场次分
 	if data, ok := p.GDatas[keyGameFreeId]; ok {
 		if data.FirstTime.IsZero() {
@@ -2159,27 +2149,6 @@ func (this *Scene) Statistics(param *StaticParam) {
 		p.GDatas[keyGameId] = data
 		statics = append(statics, &data.Statics)
 	}
-	//按游戏组分
-	getMinTime := func() time.Time {
-		var minTime = time.Now()
-		for _, v := range srvdata.GameFreeMgr.GetGameId(this.GetDBGameFree().GetGameDif()) {
-			vv := p.GDatas[strconv.Itoa(int(v))]
-			if vv != nil && vv.FirstTime.Before(minTime) {
-				minTime = vv.FirstTime
-			}
-		}
-		return minTime
-	}
-	if data, ok := p.GDatas[keyGameDif]; ok {
-		if data.FirstTime.IsZero() {
-			data.FirstTime = getMinTime()
-		}
-		statics = append(statics, &data.Statics)
-	} else {
-		data = &model.PlayerGameInfo{FirstTime: getMinTime()}
-		p.GDatas[keyGameDif] = data
-		statics = append(statics, &data.Statics)
-	}
 
 	// 新手输赢统计
 	if !model.GameParamData.CloseNovice && !common.InSliceInt(model.GameParamData.CloseNoviceGame, int(this.GameId)) && isControl && wbLevel == 0 && isNovice {
@@ -2350,7 +2319,6 @@ func (this *Scene) StaticsLaba(param *StaticLabaParam) {
 	var statics []*model.PlayerGameStatics
 	keyGameId := strconv.Itoa(this.GetGameId())
 	keyGameFreeId := strconv.Itoa(int(this.GetGameFreeId()))
-	keyGameDif := common.GetGameDifKey(this.GetDBGameFree().GetGameDif())
 	// 当天数据统计
 	// 按场次分
 	if data, ok := p.TodayGameData.CtrlData[keyGameFreeId]; ok {
@@ -2368,14 +2336,6 @@ func (this *Scene) StaticsLaba(param *StaticLabaParam) {
 		p.TodayGameData.CtrlData[keyGameId] = data
 		statics = append(statics, data)
 	}
-	// 按游戏组
-	if data, ok := p.TodayGameData.CtrlData[keyGameDif]; ok {
-		statics = append(statics, data)
-	} else {
-		data = model.NewPlayerGameStatics()
-		p.TodayGameData.CtrlData[keyGameDif] = data
-		statics = append(statics, data)
-	}
 	// 按场次分
 	if data, ok := p.GDatas[keyGameFreeId]; ok {
 		if data.FirstTime.IsZero() {
@@ -2398,27 +2358,6 @@ func (this *Scene) StaticsLaba(param *StaticLabaParam) {
 		p.GDatas[keyGameId] = data
 		statics = append(statics, &data.Statics)
 	}
-	// 按游戏组
-	getMinTime := func() time.Time {
-		var minTime = time.Now()
-		for _, v := range srvdata.GameFreeMgr.GetGameId(this.GetDBGameFree().GetGameDif()) {
-			vv := p.GDatas[strconv.Itoa(int(v))]
-			if vv != nil && vv.FirstTime.Before(minTime) {
-				minTime = vv.FirstTime
-			}
-		}
-		return minTime
-	}
-	if data, ok := p.GDatas[keyGameDif]; ok {
-		if data.FirstTime.IsZero() {
-			data.FirstTime = getMinTime()
-		}
-		statics = append(statics, &data.Statics)
-	} else {
-		data = &model.PlayerGameInfo{FirstTime: getMinTime()}
-		p.GDatas[keyGameDif] = data
-		statics = append(statics, &data.Statics)
-	}
 
 	for _, data := range statics {
 		if data != nil {

gamesrv/caishen/scenepolicy_caishen.go

@@ -1035,6 +1035,8 @@ func CaiShenCheckAndSaveLog(sceneEx *CaiShenSceneData, playerEx *CaiShenPlayerDa
 					Platform:          playerEx.Platform,
 					Snid:              playerEx.SnId,
 					PlayerName:        playerEx.Name,
+					Channel:           playerEx.Channel,
+					ChannelId:         playerEx.ChannelId,
 					TotalIn:           totalin,
 					TotalOut:          totalout,
 					TaxCoin:           playerEx.taxCoin,

gamesrv/chess/scenepolicy.go

@@ -1315,6 +1315,8 @@ func (this *SceneStateBilled) OnEnter(s *base.Scene) {
 					Platform:          o_player.Platform,
 					Snid:              o_player.UserId,
 					PlayerName:        "",
+					Channel:           o_player.Channel,
+					ChannelId:         o_player.ChannelId,
 					TotalIn:           totalin,
 					TotalOut:          totalout,
 					TaxCoin:           o_player.GainTaxCoin,

gamesrv/clawdoll/scenepolicy_clawdoll.go

@@ -795,6 +795,8 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 				Platform:    playerEx.Platform,
 				Snid:        playerEx.SnId,
 				PlayerName:  playerEx.Name,
+				Channel:     playerEx.Channel,
+				ChannelId:   playerEx.ChannelId,
 				TotalIn:     totalin,
 				TotalOut:    totalout,
 				TaxCoin:     playerEx.taxCoin,

gamesrv/easterisland/scenepolicy_easterisland.go

@@ -904,6 +904,8 @@ func EasterIslandCheckAndSaveLog(sceneEx *EasterIslandSceneData, playerEx *Easte
 					Platform:          playerEx.Platform,
 					Snid:              playerEx.SnId,
 					PlayerName:        playerEx.Name,
+					Channel:           playerEx.Channel,
+					ChannelId:         playerEx.ChannelId,
 					TotalIn:           totalin,
 					TotalOut:          totalout,
 					TaxCoin:           playerEx.taxCoin,

gamesrv/fishing/playerdata_fishing.go

@@ -267,6 +267,8 @@ func (this *FishingPlayerData) SaveDetailedLog(s *base.Scene) {
 				Platform:          this.Platform,
 				Snid:              this.SnId,
 				PlayerName:        this.Name,
+				Channel:           this.Channel,
+				ChannelId:         this.ChannelId,
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           int64(this.sTaxCoin),

gamesrv/fortunedragon/scenepolicy_fortunedragon.go

@@ -537,6 +537,8 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
 				PlayerName:        playerEx.Name,
+				Channel:           playerEx.Channel,
+				ChannelId:         playerEx.ChannelId,
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,

gamesrv/fortunemouse/scenepolicy_fortunemouse.go

@@ -548,6 +548,8 @@ func FortuneMouseAndSaveLog(sceneEx *FortuneMouseSceneData, playerEx *FortuneMou
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
 				PlayerName:        playerEx.Name,
+				Channel:           playerEx.Channel,
+				ChannelId:         playerEx.ChannelId,
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,

gamesrv/fortuneox/scenepolicy_fortuneox.go

@@ -548,6 +548,8 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
 				PlayerName:        playerEx.Name,
+				Channel:           playerEx.Channel,
+				ChannelId:         playerEx.ChannelId,
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,

gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go

@@ -535,6 +535,8 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
 				PlayerName:        playerEx.Name,
+				Channel:           playerEx.Channel,
+				ChannelId:         playerEx.ChannelId,
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,

gamesrv/fortunetiger/scenepolicy_fortunetiger.go

@@ -548,6 +548,8 @@ func FortuneTigerAndSaveLog(sceneEx *FortuneTigerSceneData, playerEx *FortuneTig
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
 				PlayerName:        playerEx.Name,
+				Channel:           playerEx.Channel,
+				ChannelId:         playerEx.ChannelId,
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,

gamesrv/fruits/scenedata_fruits.go

@@ -345,6 +345,8 @@ func (s *FruitsSceneData) SaveLog(p *FruitsPlayerData, isOffline int) {
 			Platform:          p.Platform,
 			Snid:              p.SnId,
 			PlayerName:        p.Name,
+			Channel:           p.Channel,
+			ChannelId:         p.ChannelId,
 			TotalIn:           totalIn,
 			TotalOut:          totalOut,
 			TaxCoin:           p.taxCoin,

gamesrv/iceage/scenepolicy_iceage.go

@@ -954,6 +954,8 @@ func IceAgeCheckAndSaveLog(sceneEx *IceAgeSceneData, playerEx *IceAgePlayerData)
 					Platform:          playerEx.Platform,
 					Snid:              playerEx.SnId,
 					PlayerName:        playerEx.Name,
+					Channel:           playerEx.Channel,
+					ChannelId:         playerEx.ChannelId,
 					TotalIn:           totalin,
 					TotalOut:          totalout,
 					TaxCoin:           playerEx.taxCoin,

gamesrv/richblessed/scenedata_richblessed.go

@@ -367,6 +367,8 @@ func (s *RichBlessedSceneData) SaveLog(p *RichBlessedPlayerData, isOffline int)
 			Platform:          p.Platform,
 			Snid:              p.SnId,
 			PlayerName:        p.Name,
+			Channel:           p.Channel,
+			ChannelId:         p.ChannelId,
 			TotalIn:           totalIn,
 			TotalOut:          totalOut,
 			TaxCoin:           p.taxCoin,

gamesrv/smallrocket/scenepolicy.go

@@ -1179,6 +1179,8 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 							Platform:          playerEx.Platform,
 							Snid:              playerEx.SnId,
 							PlayerName:        playerEx.Name,
+							Channel:           playerEx.Channel,
+							ChannelId:         playerEx.ChannelId,
 							TotalIn:           totalin,
 							TotalOut:          totalout,
 							TaxCoin:           playerEx.taxCoin,
@@ -1256,6 +1258,8 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 						Platform:          playerEx.Platform,
 						Snid:              playerEx.SnId,
 						PlayerName:        playerEx.Name,
+						Channel:           playerEx.Channel,
+						ChannelId:         playerEx.ChannelId,
 						TotalIn:           totalin,
 						TotalOut:          totalout,
 						TaxCoin:           playerEx.taxCoin,

gamesrv/tamquoc/scenepolicy_tamquoc.go

@@ -790,6 +790,8 @@ func TamQuocCheckAndSaveLog(sceneEx *TamQuocSceneData, playerEx *TamQuocPlayerDa
 					Platform:          playerEx.Platform,
 					Snid:              playerEx.SnId,
 					PlayerName:        playerEx.Name,
+					Channel:           playerEx.Channel,
+					ChannelId:         playerEx.ChannelId,
 					TotalIn:           totalin,
 					TotalOut:          totalout,
 					TaxCoin:           playerEx.taxCoin,

gamesrv/thirteen/scenepolicy.go

@@ -188,6 +188,8 @@ func (this *PolicyThirteen) OnPlayerLeave(s *base.Scene, p *base.Player, reason
 				Platform:          playerEx.Platform,
 				Snid:              playerEx.SnId,
 				PlayerName:        playerEx.Name,
+				Channel:           playerEx.Channel,
+				ChannelId:         playerEx.ChannelId,
 				TotalIn:           totalin,
 				TotalOut:          totalout,
 				TaxCoin:           playerEx.taxCoin,
@@ -1436,6 +1438,8 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 								Platform:          o_player.Platform,
 								Snid:              o_player.SnId,
 								PlayerName:        o_player.Name,
+								Channel:           o_player.Channel,
+								ChannelId:         o_player.ChannelId,
 								TotalIn:           totalin,
 								TotalOut:          totalout,
 								TaxCoin:           o_player.taxCoin,

gamesrv/tienlen/scenepolicy_tienlen.go

@@ -2761,6 +2761,8 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
 						LogId:             sceneEx.recordId,
 						Platform:          o_player.Platform,
 						Snid:              o_player.UserId,
+						Channel:           o_player.Channel,
+						ChannelId:         o_player.ChannelId,
 						TotalIn:           totalin,
 						TotalOut:          totalout,
 						TaxCoin:           o_player.BillTaxCoin,

model/dataevent.go

@@ -245,36 +245,34 @@ func CreatePlayerLoginEvent(snid int32, channel, promoter, platform, city, os, i
 
 // 玩家游戏记录
 type PlayerGameRecEvent struct {
-	Id            string //id
+	RecordId          string //游戏记录ID
-	RecordId      string //游戏记录ID
+	SnId              int32  //用户ID
-	SnId          int32  //用户ID
+	Channel           string //包类型
-	Channel       string //包类型
+	Promoter          string //推广
-	Platform      string //平台
+	Platform          string //平台
-	OS            string //操作系统
+	City              string //城市
-	GameId        int32  //游戏id
+	OS                string //操作系统
-	ModeId        int32  //游戏模式
+	TelephonePromoter int32  //电销标记
-	Tax           int64  //税收
+	GameId            int32  //游戏id
-	Amount        int64  //金币变化,税后（正值为赢；负值为输）
+	ModeId            int32  //游戏模式
-	CreateTime    int64  //创建时间
+	Tax               int64  //税收
-	CreateDayTime int64  //账号创建时间0点
+	Amount            int64  //金币变化（正值为赢；负值为输）
-	Out           int64  //产出
+	CreateTime        int64  //创建时间
-	In            int64  //投入
+	CreateDayTime     int64  //账号创建时间0点
-	IsNew         int32  //是否是新人
+	ValidBet          int64  //有效下注数量
-	GameFreeID    int32  //游戏freeid
+	ValidFlow         int64  //有效流水数量
-	GamingTime    int32  //游戏开始到玩家结算的时长 单位：秒
+	Out               int64  //产出
-
+	In                int64  //投入
-	GameDif          string // 游戏分组
+	IsNew             int32  //是否是新人
-	FirstGameDifTime int64  // 首次游戏分组时间
+	GameFreeID        int32  //游戏freeid
-	GameDifTimes     int64  // 游戏分组游戏次数
+	GamingTime        int32  //游戏开始到玩家结算的时长 单位：秒
-
+	FirstTime         int64  //首次玩该场次游戏时间
-	FirstTime int64 //首次玩该场次游戏时间
+	PlayTimes         int64  //该场次游戏次数
-	PlayTimes int64 //该场次游戏次数
+	FirstGameTime     int64  //首次玩游戏时间
-
+	PlayGameTimes     int64  //该游戏总次数
-	FirstGameTime int64 //首次玩游戏时间
+	LastLoginTime     int64  //最后登录时间
-	PlayGameTimes int64 //该游戏总次数
+	DeviceId          string //设备id
-
+	ChannelId         string //推广渠道id
-	LastLoginTime int64  //最后登录时间
-	ChannelId     string //推广渠道id
 }
 
 // 玩家游戏记录

model/gamedetailedlog.go

@@ -23,33 +23,9 @@ type CoinPoolCtx struct {
 	Controlled bool  //被水池控制了
 }
 
-type GameDetailedLog struct {
+type GameDetailedLogRet struct {
-	Id               bson.ObjectId `bson:"_id"`
+	Gplt GameDetailedLogType
-	Platform         string        // 平台
-	LogId            string        // 记录ID，每局游戏唯一
-	GameDif          string        // 游戏组
-	GameId           int32         // 游戏id
-	GameClass        int32         // 游戏类型
-	GameMode         int32         // 游戏模式，弃用
-	GameType         int32         // 游戏类型
-	GameFreeId       int32         // 场次id
-	CycleId          string        // 房卡场id，多轮有相同的id
-	MatchId          int64         // 比赛ID，应该用字符串的
-	SceneId          int32         // 房间id，会重复
-	PlayerCount      int32         // 玩家数量
-	GameTiming       int32         // 游戏用时，秒
-	GameBaseBet      int32         // 游戏底分
-	Ts               int64         // 时间戳
-	Time             time.Time     // 记录时间
-	GameDetailedNote string        // 游戏详情
-	GameDetailVer    int32         // 游戏详情版本
-
-	CpCtx         CoinPoolCtx // 水池上下文信息
-	Trend20Lately string      // 最近游戏走势
-	CtrlType      int         // 1控赢 2控输 0不控
-	PlayerPool    map[int]int // 个人水池分 玩家id:分
 }
-
 type GameDetailedLogType struct {
 	PageNo   int                //当前页码
 	PageSize int                //每页数量
@@ -57,8 +33,64 @@ type GameDetailedLogType struct {
 	Data     []*GameDetailedLog //当页数据
 }
 
-type GameDetailedLogRet struct {
+type GameDetailedLog struct {
-	Gplt GameDetailedLogType
+	Id               bson.ObjectId `bson:"_id"` //记录ID
+	LogId            string        //记录ID，每局游戏唯一
+	GameId           int32         //游戏id
+	ClubId           int32         //俱乐部Id
+	ClubRoom         string        //俱乐部包间
+	Platform         string        //平台id
+	Channel          string        //渠道
+	Promoter         string        //推广员
+	MatchId          int64         //比赛ID，应该用字符串的
+	SceneId          int32         //房间id，会重复
+	GameMode         int32         //游戏类型
+	GameFreeid       int32         //游戏类型房间号
+	PlayerCount      int32         //玩家数量
+	GameTiming       int32         //本局游戏用时(mm)
+	GameBaseBet      int32         //游戏单位低分
+	GameDetailedNote string        //游戏详情
+	GameDetailVer    int32         //游戏详情版本
+	CpCtx            CoinPoolCtx   //水池上下文信息
+	Time             time.Time     //记录时间
+	Trend20Lately    string        //最近游戏走势
+	Ts               int64         //时间戳
+	CtrlType         int           // 1控赢 2控输 0不控
+	PlayerPool       map[int]int   // 个人水池分
+	CycleId          string        // 本轮id，打一轮有多局
+}
+
+func NewGameDetailedLog() *GameDetailedLog {
+	log := &GameDetailedLog{Id: bson.NewObjectId()}
+	return log
+}
+
+func NewGameDetailedLogEx(logid string, gameid, sceneid, gamemode, gamefreeid, playercount, gametiming, gamebasebet int32,
+	gamedetailednote string, platform string, clubId int32, clubRoom string, cpCtx CoinPoolCtx, ver int32,
+	trend20Lately string, ctrlType int, playerPool map[int]int, cycleId string) *GameDetailedLog {
+	cl := NewGameDetailedLog()
+	cl.LogId = logid
+	cl.GameId = gameid
+	cl.ClubId = clubId
+	cl.ClubRoom = clubRoom
+	cl.SceneId = sceneid
+	cl.GameMode = gamemode
+	cl.GameFreeid = gamefreeid
+	cl.PlayerCount = playercount
+	cl.GameTiming = gametiming
+	cl.GameBaseBet = gamebasebet
+	cl.GameDetailedNote = gamedetailednote
+	cl.Platform = platform
+	tNow := time.Now()
+	cl.Time = tNow
+	cl.CpCtx = cpCtx
+	cl.GameDetailVer = ver
+	cl.Trend20Lately = trend20Lately
+	cl.Ts = time.Now().Unix()
+	cl.CtrlType = ctrlType
+	cl.PlayerPool = playerPool
+	cl.CycleId = cycleId
+	return cl
 }
 
 func InsertGameDetailedLog(log *GameDetailedLog) (err error) {

model/gameplayerlistlog.go

@@ -21,36 +21,86 @@ type GameTotalRecord struct {
 
 type GamePlayerListLog struct {
 	LogId             bson.ObjectId `bson:"_id"` //记录ID
-	Platform          string        // 平台
+	SnId              int32         //用户Id
-	GameDif           string        // 游戏组
+	Name              string        //名称
-	GameId            int32         // 游戏id
+	GameId            int32         //游戏id
-	GameClass         int32         // 游戏类型
+	BaseScore         int32         //游戏底注
-	GameMode          int32         // 游戏模式，弃用
+	ClubId            int32         //俱乐部Id
-	GameType          int32         // 游戏类型
+	ClubRoom          string        //俱乐部包间
-	GameFreeId        int32         // 场次id
+	TaxCoin           int64         //税收
-	BaseScore         int32         // 游戏底注
+	ClubPumpCoin      int64         //俱乐部额外抽水
-	GameDetailedLogId string        // 游戏记录Id
+	Platform          string        //平台id
-	Channel           string        // 包类型
+	Channel           string        //渠道
-	ChannelId         string        // 推广渠道
+	Promoter          string        //推广员
-	RoomType          int32         // 房间类型
+	PackageTag        string        //包标识
-	Ts                int64         // 记录时间
+	SceneId           int32         //场景ID
-	Time              time.Time     // 记录时间
+	GameMode          int32         //游戏类型
-	CycleId           string        // 本轮id，打一轮有多局
+	GameFreeid        int32         //游戏类型房间号
+	GameDetailedLogId string        //游戏记录Id
+	IsFirstGame       bool          //是否第一次游戏
+	//对于拉霸类：BetAmount=100	WinAmountNoAnyTax=0	（表示投入多少、收益多少，值>=0）
+	//拉霸类小游戏会是：BetAmount=0		WinAmountNoAnyTax=100	（投入0、收益多少，值>=0）
+	//对战场：BetAmount=0		WinAmountNoAnyTax=100	（投入会有是0、收益有正负，WinAmountNoAnyTax=100则盈利，WinAmountNoAnyTax=-100则输100）
+	BetAmount         int64     //下注金额
+	WinAmountNoAnyTax int64     //盈利金额，不包含任何税
+	TotalIn           int64     //本局投入
+	TotalOut          int64     //本局产出
+	Time              time.Time //记录时间
+	RoomType          int32     //房间类型
+	GameDif           string    //游戏标识
+	GameClass         int32     //游戏类型 1棋牌	2电子	3百人	4捕鱼	5视讯	6彩票	7体育
+	MatchId           int64
+	MatchType         int64 //0.普通场 1.锦标赛 2.冠军赛 3.vip专属
+	Ts                int64
+	IsFree            bool   //拉霸专用 是否免费
+	WinSmallGame      int64  //拉霸专用 小游戏奖励
+	WinTotal          int64  //拉霸专用 输赢
+	CycleId           string // 本轮id，打一轮有多局
+}
 
-	SnId              int32  // 用户Id
+func NewGamePlayerListLog() *GamePlayerListLog {
-	Name              string // 名称
+	log := &GamePlayerListLog{LogId: bson.NewObjectId()}
-	SceneId           int32  // 房间id，会重复
+	return log
-	MatchId           int64  // 比赛ID，应该用字符串的
+}
-	MatchType         int64  // 0.普通场 1.锦标赛 2.冠军赛 3.vip专属
+func NewGamePlayerListLogEx(snid int32, gamedetailedlogid string, platform, channel, promoter, packageTag string, gameid, baseScore,
-	WinAmountNoAnyTax int64  // 盈利金额，不包含任何税
+	sceneid, gamemode, gamefreeid int32, totalin, totalout int64, clubId int32, clubRoom string, taxCoin, pumpCoin int64, roomType int32,
-	TaxCoin           int64  // 税收
+	betAmount, winAmountNoAnyTax int64, key, name string, gameClass int32, isFirst bool, matchid, matchType int64,
-	BetAmount         int64  // 下注金额
+	isFree bool, winSmallGame, winTotal int64, cycleId string) *GamePlayerListLog {
-	IsFirstGame       bool   // 是否第一次游戏
+	cl := NewGamePlayerListLog()
-	TotalIn           int64  // 本局投入
+	cl.SnId = snid
-	TotalOut          int64  // 本局产出
+	cl.GameDetailedLogId = gamedetailedlogid
-	IsFree            bool   // 拉霸专用 是否免费
+	cl.Platform = platform
-	WinSmallGame      int64  // 拉霸专用 小游戏奖励
+	cl.Name = name
-	WinTotal          int64  // 拉霸专用 输赢
+	cl.Channel = channel
+	cl.Promoter = promoter
+	cl.PackageTag = packageTag
+	cl.GameFreeid = gamefreeid
+	cl.GameId = gameid
+	cl.BaseScore = baseScore
+	cl.ClubId = clubId
+	cl.GameMode = gamemode
+	cl.SceneId = sceneid
+	cl.TotalIn = totalin
+	cl.TotalOut = totalout
+	cl.ClubRoom = clubRoom
+	cl.TaxCoin = taxCoin
+	cl.IsFirstGame = isFirst
+	cl.ClubPumpCoin = pumpCoin
+	cl.RoomType = roomType
+	cl.BetAmount = betAmount
+	cl.WinAmountNoAnyTax = winAmountNoAnyTax
+	cl.GameDif = key
+	cl.GameClass = gameClass
+	cl.IsFree = isFree
+	cl.WinSmallGame = winSmallGame
+	cl.WinTotal = winTotal
+	tNow := time.Now()
+	cl.Ts = tNow.Unix()
+	cl.Time = tNow
+	cl.MatchId = matchid
+	cl.MatchType = matchType
+	cl.CycleId = cycleId
+	return cl
 }
 
 type GamePlayerListRet struct {

model/itemdatalog.go

@@ -28,7 +28,6 @@ type ItemLog struct {
 	TypeId       int32         // 变化类型
 	GameId       int64         // 游戏id,游戏中获得时有值
 	GameFreeId   int64         // 场次id,游戏中获得时有值
-	GameDif      string        // 游戏分组
 	Cost         []*Item       // 消耗的道具
 	Id           string        // 撤销的id，兑换失败
 	RoomConfigId int32         // 房间配置id
@@ -51,7 +50,6 @@ type ItemParam struct {
 	TypeId       int32   // 变化类型
 	GameId       int64   // 游戏id,游戏中获得时有值
 	GameFreeId   int64   // 场次id,游戏中获得时有值
-	GameDif      string  // 游戏分组
 	Cost         []*Item // 消耗的道具
 	LogId        string  // 撤销的id，兑换失败
 	RoomConfigId int32   // 房间配置id
@@ -73,7 +71,6 @@ func NewItemLogEx(param ItemParam) *ItemLog {
 	itemLog.TypeId = param.TypeId
 	itemLog.GameId = param.GameId
 	itemLog.GameFreeId = param.GameFreeId
-	itemLog.GameDif = param.GameDif
 	itemLog.Cost = param.Cost
 	itemLog.Id = param.LogId
 	itemLog.RoomConfigId = param.RoomConfigId
@@ -249,7 +246,7 @@ type InsertItemLogReq struct {
 	Logs []*ItemLog
 }
 
-func InsertItemLog(configItems map[int32]*server.DB_GameItem, param *AddItemParam, gamedif string, isOffline bool) error {
+func InsertItemLog(configItems map[int32]*server.DB_GameItem, param *AddItemParam, isOffline bool) error {
 	if rpcCli == nil {
 		logger.Logger.Warnf("rpcCli is nil")
 		return errors.New("rpcCli is nil")
@@ -283,7 +280,6 @@ func InsertItemLog(configItems map[int32]*server.DB_GameItem, param *AddItemPara
 			TypeId:       param.GainWay,
 			GameId:       param.GameId,
 			GameFreeId:   param.GameFreeId,
-			GameDif:      gamedif,
 			Cost:         param.Cost,
 			LogId:        param.LogId,
 			RoomConfigId: param.RoomConfigId,

robot/base/clientmgr.go

@@ -27,19 +27,6 @@ import (
  登录及机器人账号更新
 */
 
-func init() {
-	common.RegisterClockFunc(&common.ClockFunc{
-		OnHourTimerFunc: func() {
-			ClientMgrSingleton.AccountReplace()
-
-			logger.Logger.Info(ClientMgrSingleton.GetState())
-		},
-		OnDayTimerFunc: func() {
-			ClientMgrSingleton.AccountDeletePolicy()
-		},
-	})
-}
-
 var ClientMgrSingleton = &ClientMgr{
 	sessionPool:    make(map[string]*netlib.Session),
 	Running:        true,
@@ -110,17 +97,13 @@ func (this *ClientMgr) UnRegisterSession(acc string) {
 	delete(this.sessionPool, acc)
 }
 
-// AccountReplace 账号替换
+func (this *ClientMgr) HourChange() {
-func (this *ClientMgr) AccountReplace() {
 	fileModify := false
 	eventArr := this.CycleTimeEvent[time.Now().Hour()]
 	for _, event := range eventArr {
 		accChan[event.newAcc] = true //使用新的账号
-
+		cfg := NewSessionConfig()
-		//创建新的连接
+		netlib.Connect(cfg) //创建新的连接
-		NewSession()
-
-		// 关闭旧的连接
 		if session, ok := this.sessionPool[event.oldAcc]; ok && session != nil {
 			//删除旧有账号数据
 			pack := &serverproto.RWAccountInvalid{
@@ -132,7 +115,6 @@ func (this *ClientMgr) AccountReplace() {
 			//关闭连接
 			session.Close()
 		}
-
 		//更新本地账号数据信息
 		for key, value := range accPool {
 			if value.Acc == event.oldAcc {
@@ -161,8 +143,7 @@ func (this *ClientMgr) AccountReplace() {
 	}
 }
 
-// AccountDeletePolicy 账号删除策略
+func (this *ClientMgr) DayChange() {
-func (this *ClientMgr) AccountDeletePolicy() {
 	invalidCount := 0                                                           //过期账号数量
 	updateLimit := len(accPool) * model.GameParamData.InvalidRobotAccRate / 100 //可更新的账号数量
 	invalidAccs := []InvalidAcc{}
@@ -201,23 +182,3 @@ func (this *ClientMgr) AccountDeletePolicy() {
 		this.CycleTimeEvent[timePoint] = eventArr
 	}
 }
-
-type ClientState struct {
-	SessionNum int
-	Event      map[int]int
-}
-
-func (c *ClientState) String() string {
-	return fmt.Sprintf("ClientMgrState 连接总数:%v, 每小时账号替换数量:%v", c.SessionNum, c.Event)
-}
-
-func (this *ClientMgr) GetState() *ClientState {
-	ret := &ClientState{
-		SessionNum: len(this.sessionPool),
-		Event:      make(map[int]int),
-	}
-	for k, v := range this.CycleTimeEvent {
-		ret.Event[k] = len(v)
-	}
-	return ret
-}

robot/base/clock.go

@@ -0,0 +1,90 @@
+package base
+
+import (
+	"time"
+
+	"mongo.games.com/goserver/core/module"
+)
+
+/*
+ 计时器
+*/
+
+var ClockMgrSingleton = &ClockMgr{
+	LastHour: -1,
+	LastDay:  -1,
+}
+
+type ClockMgr struct {
+	LastTime  time.Time
+	LastMonth time.Month
+	LastWeek  int
+	LastDay   int
+	LastHour  int
+	LastMini  int
+	LastSec   int
+}
+
+func (this *ClockMgr) ModuleName() string {
+	return "ClockMgr"
+}
+
+func (this *ClockMgr) Init() {
+	tNow := time.Now().Local()
+	this.LastTime = tNow
+	_, this.LastMonth, this.LastDay = tNow.Date()
+	this.LastHour, this.LastMini, this.LastSec = tNow.Hour(), tNow.Minute(), tNow.Second()
+	_, this.LastWeek = tNow.ISOWeek()
+}
+
+func (this *ClockMgr) Update() {
+	tNow := time.Now().Local()
+	sec := tNow.Second()
+	if sec != this.LastSec {
+		this.LastSec = sec
+		// 秒
+		PlayerMgrSingleton.OnSecondTimer()
+
+		min := tNow.Minute()
+		if min != this.LastMini {
+			this.LastMini = min
+			// 分
+			PlayerMgrSingleton.OnMiniTimer()
+
+			hour := tNow.Hour()
+			if hour != this.LastHour {
+				// 时
+				ClientMgrSingleton.HourChange()
+
+				this.LastHour = hour
+				day := tNow.Day()
+				if day != this.LastDay {
+					// 天
+					ClientMgrSingleton.DayChange()
+
+					this.LastDay = day
+					_, week := tNow.ISOWeek()
+					if week != this.LastWeek {
+						// 周
+
+						this.LastWeek = week
+					}
+					month := tNow.Month()
+					if month != this.LastMonth {
+						// 月
+
+						this.LastMonth = month
+					}
+				}
+			}
+		}
+	}
+}
+
+func (this *ClockMgr) Shutdown() {
+	module.UnregisteModule(this)
+}
+
+func init() {
+	module.RegisteModule(ClockMgrSingleton, time.Millisecond*500, 0)
+}

robot/base/connect.go

@@ -18,19 +18,12 @@ var (
 	WaitConnectSessions []*netlib.SessionConfig
 )
 
-// NewSession 新建session
+func NewSessionConfig() *netlib.SessionConfig {
-// id 连接id, 默认自动分配
+	BenchMarkModule.idx++
-func NewSession(id ...int) {
 	cfg := Config.Connects
-	if len(id) > 0 && id[0] > 0 {
+	cfg.Id = BenchMarkModule.idx
-		cfg.Id = id[0]
-	} else {
-		BenchMarkModule.idx++
-		cfg.Id = BenchMarkModule.idx
-	}
 	cfg.Init()
-	logger.Logger.Info("waite connect session id=", cfg.Id)
+	return &cfg
-	WaitConnectSessions = append(WaitConnectSessions, &cfg)
 }
 
 type BenchMark struct {
@@ -44,7 +37,9 @@ func (m *BenchMark) ModuleName() string {
 func (m *BenchMark) Init() {
 	m.idx = RobotSessionStartId
 	for i := 0; i < Config.Count; i++ {
-		NewSession()
+		cfg := NewSessionConfig()
+		logger.Logger.Info("waite connect session id=", cfg.Id)
+		WaitConnectSessions = append(WaitConnectSessions, cfg)
 	}
 }
 

robot/base/gatesessionhandler.go

@@ -62,7 +62,10 @@ func (g *GateSessionHandler) OnSessionClosed(s *netlib.Session) {
 	StopSessionPingTimer(s)
 	if reconnect {
 		logger.Logger.Infof("账号重连 sessionID:%v account:%v", s.Id, accIdParam)
-		NewSession(s.GetSessionConfig().Id)
+		cfg := Config.Connects
+		cfg.Id = s.GetSessionConfig().Id
+		cfg.Init()
+		WaitConnectSessions = append(WaitConnectSessions, &cfg)
 	}
 }
 

robot/base/init.go

@@ -16,9 +16,9 @@ type AccountData struct {
 }
 
 var (
-	// 待登录的账号，将要建立连接
+	// 待使用的账号，将要建立连接
 	accChan = make(map[string]bool)
-	// 账号池，当前正在使用的机器人账号
+	// 账号池，当前正在使用的机器人
 	accPool []*AccountData
 )
 var accountFileName = "robotaccount.json"

robot/base/playermgr.go

@@ -1,32 +1,16 @@
 package base
 
 import (
-	"fmt"
 	"math/rand"
 
 	"mongo.games.com/goserver/core/logger"
 	"mongo.games.com/goserver/core/netlib"
 
-	"mongo.games.com/game/common"
 	"mongo.games.com/game/proto"
 	hall_proto "mongo.games.com/game/protocol/gamehall"
 	player_proto "mongo.games.com/game/protocol/player"
 )
 
-func init() {
-	common.RegisterClockFunc(&common.ClockFunc{
-		OnSecTimerFunc: func() {
-			PlayerMgrSingleton.OnSecondTimer()
-		},
-		OnMiniTimerFunc: func() {
-			PlayerMgrSingleton.OnMiniTimer()
-		},
-		OnHourTimerFunc: func() {
-			logger.Logger.Info(PlayerMgrSingleton.GetState())
-		},
-	})
-}
-
 var PlayerMgrSingleton = &PlayerMgr{
 	playersMapSnId:      make(map[int32]*player_proto.SCPlayerData),
 	playersSession:      make(map[int32]*netlib.Session),
@@ -177,22 +161,3 @@ func (pm *PlayerMgr) OnSecondTimer() {
 func (pm *PlayerMgr) OnMiniTimer() {
 	pm.ProcessCheckRobotNum()
 }
-
-type PlayerMgrState struct {
-	PlayerNum        int
-	NormalSessionNum int
-	MatchSessionNum  int
-}
-
-func (p *PlayerMgrState) String() string {
-	return fmt.Sprintf("PlayerMgrState 玩家总数:%v, 普通场连接数:%v, 比赛场连接数:%v", p.PlayerNum, p.NormalSessionNum, p.MatchSessionNum)
-}
-
-func (pm *PlayerMgr) GetState() *PlayerMgrState {
-	ret := &PlayerMgrState{
-		PlayerNum:        len(pm.playersMapSnId),
-		NormalSessionNum: len(pm.playersSession),
-		MatchSessionNum:  len(pm.playersMatchSession),
-	}
-	return ret
-}

robot/base/scenemgr.go

@@ -1,27 +1,14 @@
 package base
 
 import (
-	"fmt"
 	"time"
 
-	"mongo.games.com/goserver/core/logger"
 	"mongo.games.com/goserver/core/module"
 
-	"mongo.games.com/game/common"
 	server_proto "mongo.games.com/game/protocol/server"
 	"mongo.games.com/game/srvdata"
 )
 
-func init() {
-	module.RegisteModule(SceneMgrSingleton, time.Millisecond*100, 0)
-
-	common.RegisterClockFunc(&common.ClockFunc{
-		OnHourTimerFunc: func() {
-			logger.Logger.Info(SceneMgrSingleton.GetState())
-		},
-	})
-}
-
 var SceneMgrSingleton = &SceneMgr{
 	Scenes:          make(map[int32]IScene),
 	sceneDBGameFree: make(map[int32]*server_proto.DB_GameFree),
@@ -60,7 +47,6 @@ func (sm *SceneMgr) GetSceneDBGameFree(sceneId, gamefreeId int32) *server_proto.
 	return srvdata.PBDB_GameFreeMgr.GetData(gamefreeId)
 }
 
-// IsFreeMode 是否是自由桌
 func (sm *SceneMgr) IsFreeMode(sceneId int32) bool {
 	if data, exist := sm.sceneDBGameFree[sceneId]; exist {
 		return data.GetFreeMode() == 1
@@ -68,22 +54,6 @@ func (sm *SceneMgr) IsFreeMode(sceneId int32) bool {
 	return false
 }
 
-type SceneMgrState struct {
-	Num map[int32]int
-}
-
-func (s *SceneMgrState) String() string {
-	return fmt.Sprintf("SceneMgrState 每个游戏的房间数量 [游戏id:房间数量]: %v", s.Num)
-}
-
-func (sm *SceneMgr) GetState() *SceneMgrState {
-	m := make(map[int32]int)
-	for _, v := range sm.Scenes {
-		m[v.GetGameId()]++
-	}
-	return &SceneMgrState{Num: m}
-}
-
 // //////////////////////////////////////////////////////////////////
 // / Module Implement [beg]
 // //////////////////////////////////////////////////////////////////
@@ -104,3 +74,7 @@ func (sm *SceneMgr) ModuleName() string {
 func (sm *SceneMgr) Shutdown() {
 	module.UnregisteModule(sm)
 }
+
+func init() {
+	module.RegisteModule(SceneMgrSingleton, time.Millisecond*100, 0)
+}

robot/base/scplayerinfo.go

@@ -99,7 +99,6 @@ func SCPlayerFlag(s *netlib.Session, packetid int, data interface{}) error {
 		return nil
 	}
 
-	// 更新房间里玩家的状态
 	if scene, ok := GetScene(s).(IScene); ok && scene != nil {
 		p := scene.GetPlayerBySnid(msg.GetPlayerId())
 		if p != nil {

robot/base/scroom.go

@@ -52,7 +52,6 @@ func SCDestroyRoom(s *netlib.Session, packid int, pack interface{}) error {
 
 	if msg.GetOpRetCode() == gamehallproto.OpResultCode_Game_OPRC_Sucess_Game {
 		cleanRoomState(s)
-		SceneMgrSingleton.DelScene(msg.GetRoomId())
 		return nil
 	}
 

worldsrv/bagmgr.go

@@ -690,15 +690,6 @@ func (this *BagMgr) AddItems(param *model.AddItemParam) (*BagInfo, bag.OpResultC
 			logType = ItemConsume
 			num = -v.ItemNum
 		}
-		gamedif := ""
-		plt := PlatformMgrSingleton.GetPlatform(p.Platform)
-		if plt != nil {
-			gf := plt.GameConfig.GetGameConfig(int32(param.GameFreeId))
-			if gf != nil {
-				gamedif = gf.GetDbGameFree().GetGameDif()
-			}
-		}
-
 		// 日志
 		log := model.NewItemLogEx(model.ItemParam{
 			Platform:     p.Platform,
@@ -711,7 +702,6 @@ func (this *BagMgr) AddItems(param *model.AddItemParam) (*BagInfo, bag.OpResultC
 			TypeId:       param.GainWay,
 			GameId:       param.GameId,
 			GameFreeId:   param.GameFreeId,
-			GameDif:      gamedif,
 			Cost:         param.Cost,
 			LogId:        param.LogId,
 			RoomConfigId: param.RoomConfigId,
@@ -775,15 +765,6 @@ func (this *BagMgr) AddItemsOffline(param *model.AddItemParam, callback func(err
 		return
 	}
 
-	gamedif := ""
-	plt := PlatformMgrSingleton.GetPlatform(param.Platform)
-	if plt != nil && param.GameFreeId > 0 {
-		gf := plt.GameConfig.GetGameConfig(int32(param.GameFreeId))
-		if gf != nil {
-			gamedif = gf.GetDbGameFree().GetGameDif()
-		}
-	}
-
 	// 玩家离线时
 	var findPlayer *model.PlayerBaseInfo
 	task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
@@ -812,7 +793,7 @@ func (this *BagMgr) AddItemsOffline(param *model.AddItemParam, callback func(err
 			return err
 		}
 		// 保存日志
-		if err := model.InsertItemLog(srvdata.GameItemMgr.GetItems(param.Platform), param, gamedif, true); err != nil {
+		if err := model.InsertItemLog(srvdata.GameItemMgr.GetItems(param.Platform), param, true); err != nil {
 			logger.Logger.Errorf("离线保存道具变更日志错误 %v", err)
 			return err
 		}

worldsrv/player.go

@@ -1310,6 +1310,8 @@ func (this *Player) UnmarshalData(data []byte, scene *Scene) {
 	this.PlayerData.TotalFlow = pd.TotalFlow
 	if this.WelfData != nil && this.WelfData.PigBank != nil && pd.WelfData != nil && pd.WelfData.PigBank != nil {
 		this.WelfData.PigBank.BankCoin = pd.WelfData.PigBank.BankCoin
+		this.WelfData.PigBank.TakeTimes = pd.WelfData.PigBank.TakeTimes
+		this.WelfData.PigBank.DayBuyTimes = pd.WelfData.PigBank.DayBuyTimes
 	}
 	this.ItemRecExpireTime = pd.ItemRecExpireTime
 	this.IsTakeExpireItem = pd.IsTakeExpireItem

worldsrv/scene.go

@@ -341,7 +341,7 @@ func (this *Scene) PlayerEnter(p *Player, pos int, ischangeroom bool) bool {
 				//离场金币
 				leaverng := this.dbGameFree.GetRobotLimitCoin()
 				if len(leaverng) >= 2 {
-					leaveCoin = int64(common.RandInt(int(leaverng[0]), int(leaverng[1])))
+					leaveCoin = leaverng[0] + rand.Int63n(leaverng[1]-leaverng[0])
 				}
 			}
 

worldsrv/scenemgr.go

@@ -34,14 +34,13 @@ type SceneMgr struct {
 	common.BaseClockSinker                // 驱动时间事件
 	scenes                 map[int]*Scene // 房间id: Scene
 
-	privateAutoId      int // 私人房房间号
+	privateAutoId      int                 // 私人房房间号
-	matchAutoId        int // 比赛场房间号
+	matchAutoId        int                 // 比赛场房间号
-	coinSceneAutoId    int // 金币场房间号
+	coinSceneAutoId    int                 // 金币场房间号
-	hundredSceneAutoId int // 百人场房间号
+	hundredSceneAutoId int                 // 百人场房间号
-
+	password           map[string]struct{} // 密码
-	password        map[string]struct{} // 密码
+	pushList           map[int]struct{}    // 已经推荐过的房间列表
-	pushList        map[int]struct{}    // 已经推荐过的房间列表
+	lastPushSceneId    int                 // 最后推荐的房间id
-	lastPushSceneId int                 // 最后推荐的房间id
 }
 
 // AllocReplayCode 获取回访码

worldsrv/trascate_webapi.go

@@ -2212,10 +2212,10 @@ func init() {
 
 	WebAPIHandlerMgrSingleton.RegisteWebAPIHandler("/api/pay/CallbackPayment", WebAPIHandlerWrapper(
 		func(tNode *transact.TransNode, params []byte) (int, proto.Message) {
+			logger.Logger.Tracef("api /api/pay/CallbackPayment")
 			msg := &webapiproto.ASCallbackPayment{}
 			pack := &webapiproto.SACallbackPayment{}
 			err := proto.Unmarshal(params, msg)
-			logger.Logger.Info("api /api/pay/CallbackPayment msg = ", msg)
 			if err != nil {
 				pack.Tag = webapiproto.TagCode_FAILED
 				pack.Msg = "数据序列化失败" + err.Error()
@@ -2258,7 +2258,7 @@ func init() {
 				state = msg.GetState()
 				player := PlayerMgrSington.GetPlayerBySnId(info.SnId)
 				if player == nil {
-					if msg.State == 1 {
+					if info.State == 1 {
 						state = 3
 					}
 				}

worldsrv/welfmgr.go

@@ -1118,7 +1118,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
 			if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
 				p.WelfData.BlindBoxId = 0
 			}
-		} // == 1代表当日循环
+		}                               // == 1代表当日循环
 		if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
 
 			idx := bid