6

src/server/db/Mysql.go

@@ -16,13 +16,6 @@ import (
 	"github.com/jmoiron/sqlx"
 )
 
-type user struct {
-	Id       int    `db:"user_id"`
-	Sex      int    `db:"sex"`
-	UserName string `db:"username"`
-	Email    string `db:"email"`
-}
-
 var SqlDb *sqlx.DB
 var sqlDbMu sync.Mutex
 
@@ -271,6 +264,22 @@ func GetPlayerBaseInfoFromDbByName(name string) *ResPlayerBaseInfo {
 	return &res
 }
 
+func GetPlayerBan(name string) int64 {
+	sqlStr := "SELECT ban FROM t_player_baseinfo WHERE user_name = ?"
+	var ban int64
+	if err := SqlDb.Get(&ban, sqlStr, name); err != nil {
+		log.Debug("table: %s, sql :%s, exec failed, err:%v\n", "PlayerBaseInfo", sqlStr, err)
+		return 0
+	}
+	return ban
+}
+
+func UpdatePlayerBan(uid int64, ban int64) error {
+	sqlStr := "UPDATE t_player_baseinfo SET ban = ? WHERE dwUin = ?"
+	_, err := SqlDb.Exec(sqlStr, ban, uid)
+	return err
+}
+
 func UpdatePlayerBaseInfoName(oldName, newName string) error {
 	sqlStr := "UPDATE t_player_baseinfo SET user_name = ? WHERE user_name = ?"
 	_, err := SqlDb.Exec(sqlStr, newName, oldName)

src/server/db/SqlStruct.go

@@ -37,7 +37,7 @@ type ResPlayerBaseInfo struct {
 	Guild             int32  `db:"guild"`
 	PackUnlockCount   int32  `db:"pack_unlock_count"`
 	LastPlayTime      int32  `db:"last_play_time"`
-	EnergyBuyCount    int32  `db:"EnergyBuyCount"`
+	Ban               int64  `db:"ban"`
 	UserName          string `db:"user_name"`
 	NickName          string `db:"nick_name"`
 	LoginTime         int32  `db:"login_time"`

src/server/game/GameLogic.go

@@ -83,7 +83,6 @@ type GameLogic struct {
 	MailMgr      *MailMgr      // 邮件管理器
 	ChampshipMgr *ChampshipMgr // 锦标赛管理器
 	VarMgr       *VarMgr       // 变量管理器
-	BanMgr       *BanMgr       // 封号管理器
 	StartTime    int64         // 服务器启动时间
 	MessageMgr   *MessageMgr   // 消息管理器
 }
@@ -193,7 +192,6 @@ func (ad *GameLogic) NewAccountInsertDataToDB() bool {
 	playerInfo.MusicCode = 1
 	playerInfo.Guild = 1
 	playerInfo.PackUnlockCount = 5
-	playerInfo.EnergyBuyCount = 0
 	playerInfo.UserName = ad.Db_AccountInfo.UserName
 	playerInfo.LoginTime = (int32)(time.Now().Unix())
 	playerInfo.LogoutTime = 0
@@ -359,26 +357,6 @@ func (ad *GameLogic) VarMgrCall(m *MsgMod.Msg) interface{} {
 	return result
 }
 
-// 封号管理器
-func (ad *GameLogic) CreateBanMgr() {
-	ad.BanMgr = &BanMgr{
-		ServerMod: new(ServerMod),
-	}
-	ad.BanMgr.Init()
-}
-
-func (ad *GameLogic) BanMgrSend(m *MsgMod.Msg) {
-	ad.BanMgr.Send(m)
-}
-
-func (ad *GameLogic) BanMgrCall(m *MsgMod.Msg) interface{} {
-	result, err := ad.BanMgr.Call(m)
-	if err != nil {
-		return nil
-	}
-	return result
-}
-
 func (ad *GameLogic) GetSimplePlayerByUid(Id int) *PlayerSimpleData {
 	if Id == 0 {
 		return nil
@@ -494,12 +472,11 @@ func G_getGameLogic() *GameLogic {
 		G_GameLogicPtr.CreateLogManager()    //加载日志管理器
 		if conf.Server.ServerType == "center" {
 			G_GameLogicPtr.CreateFriendMgr()    //创建好友管理器
-			G_GameLogicPtr.CreateRankMgr()      //创建排行榜管理器
-			G_GameLogicPtr.CreateMailMgr()      //创建邮件管理器
 			G_GameLogicPtr.CreateChampshipMgr() // 创建竞标赛管理器
 			G_GameLogicPtr.CreateVarMgr()       // 创建变量管理器
-			G_GameLogicPtr.CreateBanMgr()       // 创建封号管理器
 		}
+		G_GameLogicPtr.CreateRankMgr()    //创建排行榜管理器
+		G_GameLogicPtr.CreateMailMgr()    //创建邮件管理器
 		G_GameLogicPtr.CreateMessageMgr() // 创建消息管理器
 		ClusterMgrInit()                  //初始化集群
 		G_GameLogicPtr.StartTime = time.Now().Unix()
@@ -676,15 +653,14 @@ func (ad *GameLogic) RegisterNetWorkFunc() {
 	RegisterMsgProcessFunc("ReqId2Verify", ReqId2Verify) // 身份证验证
 	// 玩家
 	RegisterMsgProcessFunc("ReqUserInfo", ReqUserInfo)
-	RegisterMsgProcessFunc("ReqSetName", ReqSetName)                         // 设置名字
-	RegisterMsgProcessFunc("ReqLang", ReqLang)                               // 设置语言
-	RegisterMsgProcessFunc("ReqSetPetName", ReqSetPetName)                   // 设置宠物名字
-	RegisterMsgProcessFunc("ReqSetFacebookUrl", ReqSetFacebookUrl)           // 设置facebook地址
-	RegisterMsgProcessFunc("ReqPlayerBaseInfo", ReqPlayerBaseInfofunction)   // 请求玩家基本信息
-	RegisterMsgProcessFunc("UpdateBaseItemInfo", UpdateBaseItemInfofunction) // 保存引导
-	RegisterMsgProcessFunc("ReqKv", ReqKv)                                   // 保存客户端数据
-	RegisterMsgProcessFunc("ReqGetEnergyByAD", ReqGetEnergyByAD)             // 看广告获取能量
-	RegisterMsgProcessFunc("ReqBuyEnergy", ReqBuyEnergy)                     // 购买能量
+	RegisterMsgProcessFunc("ReqSetName", ReqSetName)                       // 设置名字
+	RegisterMsgProcessFunc("ReqLang", ReqLang)                             // 设置语言
+	RegisterMsgProcessFunc("ReqSetPetName", ReqSetPetName)                 // 设置宠物名字
+	RegisterMsgProcessFunc("ReqSetFacebookUrl", ReqSetFacebookUrl)         // 设置facebook地址
+	RegisterMsgProcessFunc("ReqPlayerBaseInfo", ReqPlayerBaseInfofunction) // 请求玩家基本信息
+	RegisterMsgProcessFunc("ReqKv", ReqKv)                                 // 保存客户端数据
+	RegisterMsgProcessFunc("ReqGetEnergyByAD", ReqGetEnergyByAD)           // 看广告获取能量
+	RegisterMsgProcessFunc("ReqBuyEnergy", ReqBuyEnergy)                   // 购买能量
 	// #region 棋盘
 	RegisterMsgProcessFunc("ReqPlayerChessData", ReqPlayerChessDataFunc)
 	RegisterMsgProcessFunc("UpdatePlayerChessData", UpdatePlayerChessDataFunc) // 更新棋盘数据
@@ -954,7 +930,6 @@ func Destroy() {
 		G_GameLogicPtr.ChampshipMgr.SaveData()
 		G_GameLogicPtr.MailMgr.SaveData()
 		G_GameLogicPtr.VarMgr.SaveData()
-		G_GameLogicPtr.BanMgr.SaveData()
 		G_GameLogicPtr.MLogManager.Close()
 	}
 	log.Debug("服务器下线完成")

src/server/game/admin.go

@@ -100,7 +100,7 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg
 		return
 	}
 
-	if G_GameLogicPtr.BanMgr.IsBanned(playerbaseinfo.DwUin) {
+	if playerbaseinfo.Ban > GoUtil.Now() || playerbaseinfo.Ban == -1 {
 		ResLogin = &msg.ResLogin{
 			ResultCode: MergeConst.Protocol_Error_Account_Ban,
 			DwUin:      0,
@@ -176,7 +176,7 @@ func AdminPlayerInfo(args []interface{}) error {
 	res["Cumulative"] = player.PlayMod.getBaseMod().Cumulative
 	res["RegisterTime"] = player.GetPlayerBaseMod().GetRegisterTime()
 	res["TodayCumulative"] = player.PlayMod.getBaseMod().TodayCumulative
-	res["Ban"] = G_GameLogicPtr.BanMgr.GetBanInfo(player.M_DwUin).EndTime
+	res["Ban"] = db.GetPlayerBan(player.PlayMod.getBaseMod().Account)
 	if online {
 		res["Cumulative"] = int64(player.PlayMod.getBaseMod().Cumulative) + GoUtil.Now() - int64(player.PlayMod.getBaseMod().LoginTime)
 		res["TodayCumulative"] = int64(player.PlayMod.getBaseMod().TodayCumulative) + GoUtil.Now() - int64(player.PlayMod.getBaseMod().LoginTime)
@@ -283,7 +283,7 @@ func ReqAdminBan(args []interface{}) error {
 	res := make(map[string]interface{})
 	res["Code"] = 0
 	res["Msg"] = "ok"
-	G_GameLogicPtr.BanMgr.BanUser(req.Uid, int64(req.Time), req.Reason)
+	db.UpdatePlayerBan(req.Uid, int64(req.Time))
 	AdminPlayerBack(a, res)
 	return nil
 }

src/server/game/ban_mgr.go

@@ -1,69 +0,0 @@
-package game
-
-import (
-	"encoding/gob"
-	GoUtil "server/game_util"
-)
-
-type BanMgr struct {
-	*ServerMod
-}
-
-type BanData struct {
-	NewBanList map[int64]*BanInfo // 新增的封禁列表
-}
-
-type BanInfo struct {
-	UserId  int64  // 玩家ID
-	EndTime int64  // 封禁结束时间，0表示永久封禁
-	Reason  string // 封禁原因
-}
-
-func (f *BanMgr) Init() {
-	gob.Register(&BanData{})
-	f.key = BAN_MGR_KEY
-	f.data = &BanData{
-		NewBanList: make(map[int64]*BanInfo),
-	}
-	// 注册处理函数
-	f.init()
-	if f.data.(*BanData).NewBanList == nil {
-		f.data.(*BanData).NewBanList = make(map[int64]*BanInfo)
-	}
-}
-
-func (f *BanMgr) IsBanned(userId int64) bool {
-	if f.data.(*BanData).NewBanList == nil {
-		return false
-	}
-	Info, banned := f.data.(*BanData).NewBanList[userId]
-	if !banned {
-		return false
-	}
-	return Info.EndTime > GoUtil.Now() || Info.EndTime == -1 // 如果EndTime为0，表示永久封禁
-}
-
-func (f *BanMgr) GetBanInfo(userId int64) *BanInfo {
-	if f.data.(*BanData).NewBanList == nil {
-		return &BanInfo{}
-	}
-	Info, banned := f.data.(*BanData).NewBanList[userId]
-	if !banned {
-		return &BanInfo{}
-	}
-	return Info
-}
-
-func (f *BanMgr) BanUser(userId int64, endTime int64, reason string) {
-	f.data.(*BanData).NewBanList[userId] = &BanInfo{
-		UserId:  userId,
-		EndTime: endTime,
-		Reason:  reason,
-	}
-	f.SaveData()
-}
-
-func (f *BanMgr) UnbanUser(userId int64) {
-	delete(f.data.(*BanData).NewBanList, userId)
-	f.SaveData()
-}

src/server/game/cluster_mgr.go

@@ -17,14 +17,6 @@ func ClusterMgrInit() {
 
 }
 
-func clusterHandlerProcess(m *msg.Msg) {
-	if fun, ok := clusterHandler[m.Type]; ok {
-		fun(m)
-	} else {
-		FriendMgrSend(m)
-	}
-}
-
 func RegisterClusterHandler(t int, fun func(*msg.Msg) error) {
 	clusterHandler[t] = fun
 }

src/server/game/friend_mgr.go

@@ -131,12 +131,6 @@ func (f *FriendMgr) sendToPlayerOnline(m *msg.Msg) (interface{}, error) {
 	return nil, nil
 }
 
-// 同步信息
-func (f *FriendMgr) sync(m *msg.Msg) (interface{}, error) {
-	data := f.getData().List[m.From]
-	return data, nil
-}
-
 // 发送消息给玩家
 func sendToPlayer(m *msg.Msg) error {
 	p := G_GameLogicPtr.GetPlayer(int64(m.To))

src/server/game/game_type.go

@@ -5,6 +5,7 @@ import (
 	"server/game/mod/friend"
 	limitedTimeEvent "server/game/mod/limited_time_event"
 	"server/game/mod/msg"
+	proto "server/msg"
 	"sync"
 )
 
@@ -122,4 +123,6 @@ func init() {
 	gob.Register(CatnipMsg{})
 	gob.Register(&CatnipLock{})
 	gob.Register(CRank{})
+	gob.Register(&proto.ResChampshipRank{})
+	gob.Register(&proto.ResChampshipPreRank{})
 }

src/server/game/message_handler.go

@@ -419,7 +419,7 @@ func (p *Player) handle(m *msg.Msg) error {
 		ReplyInfo := FriendMod.AddReplyInfo(m.From, friend.REPLY_TYPE_CATNIP, fmt.Sprintf("%d", CatnipMsg.GameId), m.End, nil)
 		PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From)
 		p.PushClientRes(&proto.ResFriendReplyNotify{
-			Info: &proto.ResFriendLog{
+			Info: &proto.ResFriendReply{
 				Player: PlayerSimpleData,
 				Param:  ReplyInfo.Param,
 				Type:   int32(ReplyInfo.Type),
@@ -478,7 +478,7 @@ func (p *Player) handle(m *msg.Msg) error {
 			ReplyInfo := FriendMod.AddReplyInfo(m.From, friend.REPLY_TYPE_CATNIP_ITEMS, "", m.End, Items)
 			PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From)
 			p.PushClientRes(&proto.ResFriendReplyNotify{
-				Info: &proto.ResFriendLog{
+				Info: &proto.ResFriendReply{
 					Player: PlayerSimpleData,
 					Param:  ReplyInfo.Param,
 					Type:   int32(ReplyInfo.Type),

src/server/game/mod/msg/Msg.go

@@ -46,6 +46,8 @@ const (
 	HANDLE_MOD_REPLY_PLAYER_MSG    = 20012 // 回复玩家消息
 	HANDLE_MDO_CHAMPSHIP_INRANK    = 20013 // 锦标赛入榜
 	HANDLE_MOD_CHAMPSHIP_RANK_INFO = 20014 // 锦标赛排名信息
+	HANDLE_MOD_CHAMPSHIP_RANK_LIST = 20015 // 锦标赛排行榜
+	HANDLE_MOD_CHAMPSHIP_PRE_RANK  = 20016 // 锦标赛上期排名
 )
 
 const (

src/server/game/player_back.go

@@ -5,6 +5,7 @@ import (
 	playroomCfg "server/conf/playroom"
 	"server/game/mod/item"
 	limitedTimeEvent "server/game/mod/limited_time_event"
+	"server/game/mod/msg"
 	GoUtil "server/game_util"
 	proto "server/msg"
 )
@@ -294,8 +295,16 @@ func (p *Player) ChargeBackData() {
 
 func (p *Player) BackChampship() {
 	ChampshipMod := p.PlayMod.getChampshipMod()
-	MyRank := G_GameLogicPtr.ChampshipMgr.getMyRank(int(p.M_DwUin))
-	MyPreRank := G_GameLogicPtr.ChampshipMgr.getLastMyRank(int(p.M_DwUin))
+	MyRank := 0
+	MyPreRank := 0
+	res, _ := SendMsgToCenterSync(&msg.Msg{
+		From:       int(p.M_DwUin),
+		HandleType: msg.HANDLE_MOD_CHAMPSHIP_RANK_INFO,
+	})
+	if res != nil {
+		MyRank = res.Extra.([]int)[0]
+		MyPreRank = res.Extra.([]int)[1]
+	}
 	p.PushClientRes(ChampshipMod.BackData(MyRank, MyPreRank))
 }
 

src/server/game/player_base_mod.go

@@ -43,7 +43,7 @@ func (p *PlayerBaseData) BackUp() msg.ResPlayerBaseInfo {
 		Guild:             p.Data.Guild,
 		PackUnlockCount:   p.Data.PackUnlockCount,
 		LastPlayTime:      p.Data.LastPlayTime,
-		EnergyBuyCount:    p.Data.EnergyBuyCount,
+		Ban:               p.Data.Ban,
 		LoginTime:         p.Data.LoginTime,
 		UserName:          p.Data.UserName,
 		LogoutTime:        p.Data.LogoutTime,
@@ -70,7 +70,7 @@ func (p *PlayerBaseData) Recover(old *PlayerBaseData) *PlayerBaseData {
 		Guild:             p.Data.Guild,
 		PackUnlockCount:   p.Data.PackUnlockCount,
 		LastPlayTime:      p.Data.LastPlayTime,
-		EnergyBuyCount:    p.Data.EnergyBuyCount,
+		Ban:               p.Data.Ban,
 		LoginTime:         p.Data.LoginTime,
 		UserName:          p.Data.UserName,
 		LogoutTime:        p.Data.LogoutTime,
@@ -104,7 +104,7 @@ func (p *PlayerBaseData) LoadDataFromDB(UserName interface{}) bool {
 	p.Data.Guild = sqlStruck.Guild
 	p.Data.PackUnlockCount = sqlStruck.PackUnlockCount
 	p.Data.LastPlayTime = sqlStruck.LastPlayTime
-	p.Data.EnergyBuyCount = sqlStruck.EnergyBuyCount
+	p.Data.Ban = sqlStruck.Ban
 	p.Data.UserName = sqlStruck.UserName
 	p.Data.LogoutTime = sqlStruck.LogoutTime
 	p.Data.Todayolinetime = sqlStruck.Todayolinetime
@@ -132,7 +132,7 @@ func (p *PlayerBaseData) SaveDataFromDB(Key interface{}) bool {
 	sqlStruck.Guild = p.Data.Guild
 	sqlStruck.PackUnlockCount = p.Data.PackUnlockCount
 	sqlStruck.LastPlayTime = p.Data.LastPlayTime
-	sqlStruck.EnergyBuyCount = p.Data.EnergyBuyCount
+	sqlStruck.Ban = int64(p.Data.Ban)
 	sqlStruck.LoginTime = int32(BaseMod.LoginTime)
 	sqlStruck.UserName = p.Data.UserName
 	sqlStruck.LogoutTime = int32(BaseMod.LogoutTime)
@@ -163,22 +163,6 @@ func (p *PlayerBaseData) GetMaxEnergy() int {
 }
 
 // 更新游戏道具
-func (p *PlayerBaseData) UpdateBaseItemInfo(update *msg.UpdateBaseItemInfo) {
-	for k, v := range update.MUpdateItem {
-		switch k {
-		case 4:
-			p.Data.EnergyBuyCount = v
-		case 8:
-			p.Data.Guild = v
-		case 9:
-			p.Data.PackUnlockCount = v
-		case 10:
-			p.Data.EmitOrderCnt = v
-		case 11:
-			p.Data.LastPlayTime = v
-		}
-	}
-}
 
 func (p *PlayerBaseData) ReqRemoveAd(player *Player, buf []byte) {
 	req := &msg.ReqRemoveAd{}
@@ -654,7 +638,7 @@ func (p *PlayerBaseData) GetDataByUid(Uid interface{}) bool {
 	p.Data.Guild = sqlStruck.Guild
 	p.Data.PackUnlockCount = sqlStruck.PackUnlockCount
 	p.Data.LastPlayTime = sqlStruck.LastPlayTime
-	p.Data.EnergyBuyCount = sqlStruck.EnergyBuyCount
+	p.Data.Ban = sqlStruck.Ban
 	p.Data.LoginTime = sqlStruck.LoginTime
 	p.Data.UserName = sqlStruck.UserName
 	p.Data.LogoutTime = sqlStruck.LogoutTime

src/server/game/register_network_func.go

@@ -119,17 +119,6 @@ func ReqRemoveAdFunc(player *Player, buf []byte) error {
 	return nil
 }
 
-// 更新玩家物品
-func UpdateBaseItemInfofunction(player *Player, buf []byte) error {
-	detail := &msg.UpdateBaseItemInfo{}
-	err := proto.Unmarshal(buf, detail)
-	if err != nil {
-		return err
-	}
-	player.PlayerBaseMod.UpdateBaseItemInfo(detail)
-	return nil
-}
-
 // 请求玩家棋盘信息
 func ReqPlayerChessDataFunc(player *Player, buf []byte) error {
 	detail := &msg.ReqPlayerChessData{}
@@ -2575,7 +2564,18 @@ func ReqChampshipRank(player *Player, buf []byte) error {
 	if err != nil {
 		return err
 	}
-	m := G_GameLogicPtr.ChampshipMgr.GetRankMsg(int(player.M_DwUin))
+	res, err := SendMsgToCenterSync(&MsqMod.Msg{
+		From:       int(player.M_DwUin),
+		HandleType: MsqMod.HANDLE_MOD_CHAMPSHIP_RANK_LIST,
+	})
+	if err != nil {
+		return err
+	}
+	if res == nil {
+		player.PushClientRes(&msg.ResChampshipRank{})
+		return nil
+	}
+	m := res.Extra.(*msg.ResChampshipRank)
 	player.PushClientRes(m)
 	return nil
 }
@@ -2586,7 +2586,18 @@ func ReqChampshipPreRank(player *Player, buf []byte) error {
 	if err != nil {
 		return err
 	}
-	m := G_GameLogicPtr.ChampshipMgr.GetPreRankMsg(int(player.M_DwUin))
+	res, err := SendMsgToCenterSync(&MsqMod.Msg{
+		From:       int(player.M_DwUin),
+		HandleType: MsqMod.HANDLE_MOD_CHAMPSHIP_PRE_RANK,
+	})
+	if err != nil {
+		return err
+	}
+	if res == nil {
+		player.PushClientRes(&msg.ResChampshipPreRank{})
+		return nil
+	}
+	m := res.Extra.(*msg.ResChampshipPreRank)
 	player.PushClientRes(m)
 	return nil
 }

src/server/game/var.go

@@ -141,5 +141,8 @@ func (p *Player) GetCatnipPartner(Uid int) []int {
 		log.Error("GetVarData err : %s", err)
 		return nil
 	}
+	if data == nil {
+		return nil
+	}
 	return GoUtil.IntSlice(data.Extra)
 }