diff --git a/gamesrv/action/action_server.go b/gamesrv/action/action_server.go index 0aac537..28862f1 100644 --- a/gamesrv/action/action_server.go +++ b/gamesrv/action/action_server.go @@ -486,14 +486,6 @@ func init() { p := base.PlayerMgrSington.GetPlayerBySnId(wgSetPlayerBlackLevel.GetSnId()) if p != nil { p.WBLevel = wgSetPlayerBlackLevel.GetWBLevel() - if p.WBLevel > 0 { - p.WhiteLevel = p.WBLevel - } else if p.WBLevel < 0 { - p.BlackLevel = -p.WBLevel - } else { - p.WhiteLevel = 0 - p.BlackLevel = 0 - } p.WBCoinLimit = wgSetPlayerBlackLevel.GetWBCoinLimit() p.WBMaxNum = wgSetPlayerBlackLevel.GetMaxNum() p.WBState = wgSetPlayerBlackLevel.GetState() diff --git a/gamesrv/avengers/playerdata_avengers.go b/gamesrv/avengers/playerdata_avengers.go index 21637bf..42256e5 100644 --- a/gamesrv/avengers/playerdata_avengers.go +++ b/gamesrv/avengers/playerdata_avengers.go @@ -125,12 +125,12 @@ func (this *AvengersPlayerData) SavePlayerGameData(gameFreeId string) { // 黑白名单的限制是否生效 func (this *AvengersPlayerData) CheckBlackWriteList(isWin bool) bool { - if isWin && this.BlackLevel > 0 && this.BlackLevel <= 10 { - if rand.Int31n(100) < this.BlackLevel*10 { + if isWin && -this.WBLevel > 0 && -this.WBLevel <= 10 { + if rand.Int31n(100) < -this.WBLevel*10 { return true } - } else if !isWin && this.WhiteLevel > 0 && this.WhiteLevel <= 10 { - if rand.Int31n(100) < this.WhiteLevel*10 { + } else if !isWin && this.WBLevel > 0 && this.WBLevel <= 10 { + if rand.Int31n(100) < this.WBLevel*10 { return true } } diff --git a/gamesrv/avengers/scenepolicy_avengers.go b/gamesrv/avengers/scenepolicy_avengers.go index 0774475..5649e71 100644 --- a/gamesrv/avengers/scenepolicy_avengers.go +++ b/gamesrv/avengers/scenepolicy_avengers.go @@ -547,7 +547,7 @@ func (this *SceneStateAvengersStart) OnPlayerOp(s *base.Scene, p *base.Player, o writeBlackTryTimes++ goto WriteBlack } else if writeBlackTryTimes >= 100 && writeBlackTryTimes != 999 { - logger.Logger.Warnf("AvengersWriteBlackTryTimesOver [%v][%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.BlackLevel, playerEx.WhiteLevel) + logger.Logger.Warnf("AvengersWriteBlackTryTimesOver [%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.WBLevel) } //if playerEx.DebugGame && sceneEx.SceneType == 1 { diff --git a/gamesrv/base/player.go b/gamesrv/base/player.go index f68c934..70063c0 100644 --- a/gamesrv/base/player.go +++ b/gamesrv/base/player.go @@ -113,12 +113,9 @@ type Player struct { cparams map[string]string //平台登陆数据 Iparams map[int]int64 //整形参数 sparams map[int]string //字符参数 - WhiteLevel int32 //todo 使用WBLevel - BlackLevel int32 //todo 使用WBLevel - SingleAdjust *model.PlayerSingleAdjust - IsLocal bool //是否本地player - Items map[int32]int64 //背包数据 - MatchParams []int32 //比赛参数 排名、段位、假snid、假角色 + IsLocal bool //是否本地player + Items map[int32]int64 //背包数据 + MatchParams []int32 //比赛参数 排名、段位、假snid、假角色 MatchRobotGrades []MatchRobotGrade TestLog []string // 调试日志 RankScore map[int32]int64 // 段位积分 @@ -175,11 +172,6 @@ func (this *Player) init(data []byte) bool { if this.GDatas == nil { this.GDatas = make(map[string]*model.PlayerGameInfo) } - if this.WBLevel > 0 { - this.WhiteLevel = this.WBLevel - } else if this.WBLevel < 0 { - this.BlackLevel = -this.WBLevel - } return true } diff --git a/gamesrv/base/scene.go b/gamesrv/base/scene.go index fa99e7c..ea3eb3f 100644 --- a/gamesrv/base/scene.go +++ b/gamesrv/base/scene.go @@ -561,7 +561,7 @@ func (this *Scene) PlayerEnter(p *Player, isLoaded bool) { //避免游戏接口异常 utils.RunPanicless(func() { this.sp.OnPlayerEnter(this, p) }) - if p.BlackLevel > 0 { + if p.WBLevel < 0 { WarningBlackPlayer(p.SnId, this.DbGameFree.Id) } @@ -2336,10 +2336,6 @@ func (this *Scene) SyncPlayerDatas(param *PlayerDataParam) int64 { if v.WBGain != 0 { if p := this.GetPlayer(v.SnId); p != nil { n = p.WBUpdate(v.WBGain) - if p.WBLevel == 0 { - p.BlackLevel = 0 - p.WhiteLevel = 0 - } } } } diff --git a/gamesrv/caishen/playerdata_caishen.go b/gamesrv/caishen/playerdata_caishen.go index cdfa9af..13c1bb7 100644 --- a/gamesrv/caishen/playerdata_caishen.go +++ b/gamesrv/caishen/playerdata_caishen.go @@ -125,12 +125,12 @@ func (this *CaiShenPlayerData) SavePlayerGameData(gameFreeId string) { // 黑白名单的限制是否生效 func (this *CaiShenPlayerData) CheckBlackWriteList(isWin bool) bool { - if isWin && this.BlackLevel > 0 && this.BlackLevel <= 10 { - if rand.Int31n(100) < this.BlackLevel*10 { + if isWin && -this.WBLevel > 0 && -this.WBLevel <= 10 { + if rand.Int31n(100) < -this.WBLevel*10 { return true } - } else if !isWin && this.WhiteLevel > 0 && this.WhiteLevel <= 10 { - if rand.Int31n(100) < this.WhiteLevel*10 { + } else if !isWin && this.WBLevel > 0 && this.WBLevel <= 10 { + if rand.Int31n(100) < this.WBLevel*10 { return true } } diff --git a/gamesrv/caishen/scenepolicy_caishen.go b/gamesrv/caishen/scenepolicy_caishen.go index 06bea87..c7b995e 100644 --- a/gamesrv/caishen/scenepolicy_caishen.go +++ b/gamesrv/caishen/scenepolicy_caishen.go @@ -543,7 +543,7 @@ func (this *SceneStateCaiShenStart) OnPlayerOp(s *base.Scene, p *base.Player, op writeBlackTryTimes++ goto WriteBlack } else if writeBlackTryTimes >= 100 && writeBlackTryTimes != 999 { - logger.Logger.Warnf("CaiShenWriteBlackTryTimesOver [%v][%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.BlackLevel, playerEx.WhiteLevel) + logger.Logger.Warnf("CaiShenWriteBlackTryTimesOver [%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.WBLevel) } // 奖池水池处理 if spinRes.IsJackpot { diff --git a/gamesrv/easterisland/playerdata_easterisland.go b/gamesrv/easterisland/playerdata_easterisland.go index 747dee1..fabbad5 100644 --- a/gamesrv/easterisland/playerdata_easterisland.go +++ b/gamesrv/easterisland/playerdata_easterisland.go @@ -124,12 +124,12 @@ func (this *EasterIslandPlayerData) SavePlayerGameData(gameFreeId string) { // 黑白名单的限制是否生效 func (this *EasterIslandPlayerData) CheckBlackWriteList(isWin bool) bool { - if isWin && this.BlackLevel > 0 && this.BlackLevel <= 10 { - if rand.Int31n(100) < this.BlackLevel*10 { + if isWin && -this.WBLevel > 0 && -this.WBLevel <= 10 { + if rand.Int31n(100) < -this.WBLevel*10 { return true } - } else if !isWin && this.WhiteLevel > 0 && this.WhiteLevel <= 10 { - if rand.Int31n(100) < this.WhiteLevel*10 { + } else if !isWin && this.WBLevel > 0 && this.WBLevel <= 10 { + if rand.Int31n(100) < this.WBLevel*10 { return true } } diff --git a/gamesrv/easterisland/scenepolicy_easterisland.go b/gamesrv/easterisland/scenepolicy_easterisland.go index a3023bc..1fa3734 100644 --- a/gamesrv/easterisland/scenepolicy_easterisland.go +++ b/gamesrv/easterisland/scenepolicy_easterisland.go @@ -523,7 +523,7 @@ func (this *SceneStateEasterIslandStart) OnPlayerOp(s *base.Scene, p *base.Playe writeBlackTryTimes++ goto WriteBlack } else if writeBlackTryTimes >= 100 && writeBlackTryTimes != 999 { - logger.Logger.Warnf("EasterIslandWriteBlackTryTimesOver [%v][%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.BlackLevel, playerEx.WhiteLevel) + logger.Logger.Warnf("EasterIslandWriteBlackTryTimesOver [%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.WBLevel) } // 奖池水池处理 if spinRes.IsJackpot { diff --git a/gamesrv/fishing/playerdata_fishing.go b/gamesrv/fishing/playerdata_fishing.go index b45893b..66d9e9b 100644 --- a/gamesrv/fishing/playerdata_fishing.go +++ b/gamesrv/fishing/playerdata_fishing.go @@ -358,7 +358,7 @@ func (this *FishingPlayerData) NewStatics(betCoin, gain int64) { // end //黑白名单不参与投入产出统计,影响自己和他人体验 - if this.WhiteLevel != 0 || this.WhiteFlag != 0 || this.BlackLevel != 0 || this.GMLevel > 0 { + if this.WBLevel != 0 || this.WhiteFlag != 0 || this.GMLevel > 0 { return } diff --git a/gamesrv/iceage/playerdata_iceage.go b/gamesrv/iceage/playerdata_iceage.go index ed48775..aa317cc 100644 --- a/gamesrv/iceage/playerdata_iceage.go +++ b/gamesrv/iceage/playerdata_iceage.go @@ -123,12 +123,12 @@ func (this *IceAgePlayerData) SavePlayerGameData(gameFreeId string) { // 黑白名单的限制是否生效 func (this *IceAgePlayerData) CheckBlackWriteList(isWin bool) bool { - if isWin && this.BlackLevel > 0 && this.BlackLevel <= 10 { - if rand.Int31n(100) < this.BlackLevel*10 { + if isWin && -this.WBLevel > 0 && -this.WBLevel <= 10 { + if rand.Int31n(100) < -this.WBLevel*10 { return true } - } else if !isWin && this.WhiteLevel > 0 && this.WhiteLevel <= 10 { - if rand.Int31n(100) < this.WhiteLevel*10 { + } else if !isWin && this.WBLevel > 0 && this.WBLevel <= 10 { + if rand.Int31n(100) < this.WBLevel*10 { return true } } diff --git a/gamesrv/iceage/scenepolicy_iceage.go b/gamesrv/iceage/scenepolicy_iceage.go index f33f88f..5ce79dc 100644 --- a/gamesrv/iceage/scenepolicy_iceage.go +++ b/gamesrv/iceage/scenepolicy_iceage.go @@ -543,7 +543,7 @@ func (this *SceneStateIceAgeStart) OnPlayerOp(s *base.Scene, p *base.Player, opc writeBlackTryTimes++ goto WriteBlack } else if writeBlackTryTimes >= 100 && writeBlackTryTimes != 999 { - logger.Logger.Warnf("IceAgeWriteBlackTryTimesOver [%v][%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.BlackLevel, playerEx.WhiteLevel) + logger.Logger.Warnf("IceAgeWriteBlackTryTimesOver [%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.WBLevel) } ///////////测试游戏数据 开始////////// diff --git a/gamesrv/tamquoc/playerdata_tamquoc.go b/gamesrv/tamquoc/playerdata_tamquoc.go index 7d66450..5e28296 100644 --- a/gamesrv/tamquoc/playerdata_tamquoc.go +++ b/gamesrv/tamquoc/playerdata_tamquoc.go @@ -121,12 +121,12 @@ func (this *TamQuocPlayerData) SavePlayerGameData(gameFreeId string) { // 黑白名单的限制是否生效 func (this *TamQuocPlayerData) CheckBlackWriteList(isWin bool) bool { - if isWin && this.BlackLevel > 0 && this.BlackLevel <= 10 { - if rand.Int31n(100) < this.BlackLevel*10 { + if isWin && -this.WBLevel > 0 && -this.WBLevel <= 10 { + if rand.Int31n(100) < -this.WBLevel*10 { return true } - } else if !isWin && this.WhiteLevel > 0 && this.WhiteLevel <= 10 { - if rand.Int31n(100) < this.WhiteLevel*10 { + } else if !isWin && this.WBLevel > 0 && this.WBLevel <= 10 { + if rand.Int31n(100) < this.WBLevel*10 { return true } } diff --git a/gamesrv/tamquoc/scenepolicy_tamquoc.go b/gamesrv/tamquoc/scenepolicy_tamquoc.go index 01bb59b..27931cc 100644 --- a/gamesrv/tamquoc/scenepolicy_tamquoc.go +++ b/gamesrv/tamquoc/scenepolicy_tamquoc.go @@ -526,7 +526,7 @@ func (this *SceneStateTamQuocStart) OnPlayerOp(s *base.Scene, p *base.Player, op writeBlackTryTimes++ goto WriteBlack } else if writeBlackTryTimes >= 100 && writeBlackTryTimes != 999 { - logger.Logger.Warnf("TamquocWriteBlackTryTimesOver [%v][%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.BlackLevel, playerEx.WhiteLevel) + logger.Logger.Warnf("TamquocWriteBlackTryTimesOver [%v][%v][%v][%v]", sceneEx.GetGameFreeId(), playerEx.SnId, gamePoolCoin, playerEx.WBLevel) } // 奖池水池处理