tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update DB_GameItem.xlsx

This commit is contained in:
sk 2024-05-10 18:04:25 +08:00
parent 0d81105909
commit 995cabbea6
8 changed files with 20 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/DB_GameItem.dat
View File

Binary file not shown.

10
data/DB_GameItem.json
View File

@ -14,7 +14,7 @@
], ],
"Type": 1, "Type": 1,
"Effect0": [ "Effect0": [
0, 1,
0, 0,
1 1
], ],
@ -44,7 +44,7 @@
], ],
"Type": 2, "Type": 2,
"Effect0": [ "Effect0": [
0, 1,
0, 0,
1 1
], ],
@ -74,7 +74,7 @@
], ],
"Type": 2, "Type": 2,
"Effect0": [ "Effect0": [
0, 1,
0, 0,
1 1
], ],
@ -104,7 +104,7 @@
], ],
"Type": 2, "Type": 2,
"Effect0": [ "Effect0": [
0, 1,
0, 0,
1 1
], ],
@ -134,7 +134,7 @@
], ],
"Type": 3, "Type": 3,
"Effect0": [ "Effect0": [
0, 1,
0, 0,
1 1
], ],

8
data/DB_PropExchange.dat
View File

@ -1,5 +1,5 @@
6с├т├у├ж├в├"║█ю└= 6ж├в├с├т├у├"║█ю└=
.ш├ь├ы├з├"║█ю└= .ь├ы├з├ш├"║█ю└=
Wс├у├з├ш├ы├т├ж├в├ь├" ║█─╜Б Wз├ш├с├ж├в├ь├т├у├ы├" ║█─╜Б
]з├ш├с├у├ж├ь├т├в├ы├э├"╒█Т ]т├ж├ь├з├ш├э├с├в├ы├у├"╒█Т

BIN
data/DB_Task.dat
View File

Binary file not shown.

8
gamesrv/action/action_game.go
View File

@ -296,6 +296,10 @@ func init() {
common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_LEAVEROOM), &CSLeaveRoomHandler{}) common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_LEAVEROOM), &CSLeaveRoomHandler{})
netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_LEAVEROOM), &CSLeaveRoomPacketFactory{}) netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_LEAVEROOM), &CSLeaveRoomPacketFactory{})
// 同步玩家状态,如暂离状态取消
common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_PLAYER_SWITCHFLAG), &CSPlayerSwitchFlagHandler{})
netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_PLAYER_SWITCHFLAG), &CSPlayerSwitchFlagPacketFactory{})
// 观众离开房间 // 观众离开房间
common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_AUDIENCE_LEAVEROOM), &CSAudienceLeaveRoomHandler{}) common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_AUDIENCE_LEAVEROOM), &CSAudienceLeaveRoomHandler{})
netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_AUDIENCE_LEAVEROOM), &CSLeaveRoomPacketFactory{}) netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_AUDIENCE_LEAVEROOM), &CSLeaveRoomPacketFactory{})
@ -304,10 +308,6 @@ func init() {
common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_FORCESTART), &CSForceStartHandler{}) common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_FORCESTART), &CSForceStartHandler{})
netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_FORCESTART), &CSForceStartPacketFactory{}) netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_FORCESTART), &CSForceStartPacketFactory{})
// 同步玩家状态,如暂离状态取消
common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_PLAYER_SWITCHFLAG), &CSPlayerSwitchFlagHandler{})
netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_PLAYER_SWITCHFLAG), &CSPlayerSwitchFlagPacketFactory{})
// 房间事件 // 房间事件
common.Register(int(gamehall.GameHallPacketID_PACKET_CSRoomEvent), gamehall.CSRoomEvent{}, CSRoomEvent) common.Register(int(gamehall.GameHallPacketID_PACKET_CSRoomEvent), gamehall.CSRoomEvent{}, CSRoomEvent)
} }

413
gamesrv/action/action_server.go
View File

@ -111,6 +111,7 @@ func init() {
} }
return nil return nil
})) }))
//玩家进入 //玩家进入
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_PLAYERENTER), netlib.PacketFactoryWrapper(func() interface{} { netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_PLAYERENTER), netlib.PacketFactoryWrapper(func() interface{} {
return &server.WGPlayerEnter{} return &server.WGPlayerEnter{}
@ -449,52 +450,6 @@ func init() {
return nil return nil
})) }))
//玩家充值
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_RECHARGE), netlib.PacketFactoryWrapper(func() interface{} {
return &server.WGHundredOp{}
}))
netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_RECHARGE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
logger.Logger.Trace("WGHundredOp Process recv ", pack)
if wgHundredOp, ok := pack.(*server.WGHundredOp); ok {
if wgHundredOp.GetOpCode() == 1 {
snid := wgHundredOp.GetSnid()
param := wgHundredOp.GetParams()
p := base.PlayerMgrSington.GetPlayerBySnId(snid)
if p == nil {
logger.Logger.Warn("WGHundredOp p == nil")
return nil
}
scene := p.GetScene()
if scene == nil {
logger.Logger.Warn("WGHundredOp p.scene == nil")
return nil
}
if !scene.HasPlayer(p) {
return nil
}
//同步用户的充值累加额
if len(param) > 0 {
p.CoinPayTotal += param[0]
if p.TodayGameData != nil {
p.TodayGameData.RechargeCoin += param[0]
}
}
//第2个参数是vip
if len(param) > 1 && p.VIP < int32(param[1]) {
p.VIP = int32(param[1])
}
scene.GetScenePolicy().OnPlayerEvent(scene, p, base.PlayerEventRecharge, param)
return nil
}
return nil
}
return nil
}))
//同步水池设置 //同步水池设置
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_COINPOOLSETTING), netlib.PacketFactoryWrapper(func() interface{} { netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_COINPOOLSETTING), netlib.PacketFactoryWrapper(func() interface{} {
return &webapi.CoinPoolSetting{} return &webapi.CoinPoolSetting{}
@ -508,7 +463,7 @@ func init() {
return nil return nil
})) }))
// 重置水池水位 // 重置或修改水池水位
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_RESETCOINPOOL), netlib.PacketFactoryWrapper(func() interface{} { netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_RESETCOINPOOL), netlib.PacketFactoryWrapper(func() interface{} {
return &server.WGResetCoinPool{} return &server.WGResetCoinPool{}
})) }))
@ -552,7 +507,7 @@ func init() {
return nil return nil
})) }))
//同步游戏状态 // 修改服务状态
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_SERVER_STATE), netlib.PacketFactoryWrapper(func() interface{} { netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_SERVER_STATE), netlib.PacketFactoryWrapper(func() interface{} {
return &server.ServerState{} return &server.ServerState{}
})) }))
@ -565,254 +520,23 @@ func init() {
return nil return nil
})) }))
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_DTRoomInfo), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGDTRoomInfo{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_DTRoomInfo), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
// logger.Logger.Trace("SSPacketID_PACKET_WG_DTRoomInfo Process recv ", pack)
// if msg, ok := pack.(*server.WGDTRoomInfo); ok {
// scene := base.SceneMgrSington.GetScene(int(msg.GetRoomId()))
// if scene != nil {
// data := scene.GetScenePolicy().PacketGameData(scene)
// if pack, ok := data.(*server.GWDTRoomInfo); ok {
// pack.DataKey = proto.String(msg.GetDataKey())
// pack.RoomId = proto.Int32(msg.GetRoomId())
// } else {
// logger.Logger.Warn("Covert DT scene packet game data error.")
// }
// scene.SendToWorld(int(server.SSPacketID_PACKET_GW_DTRoomInfo), data)
// }
// return nil
// }
// return nil
//}))
//
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_DTRoomFlag), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGDTRoomFlag{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_DTRoomFlag), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
// logger.Logger.Trace("SSPacketID_PACKET_WG_DTRoomFlag Process recv ", pack)
// if msg, ok := pack.(*server.WGDTRoomFlag); ok {
// scene := base.SceneMgrSington.GetScene(int(msg.GetRoomId()))
// if scene != nil {
// data := base.InterventionData{
// Webuser: msg.GetWebuser(),
// Flag: msg.GetFlag(),
// NumOfGames: msg.GetNumGames(),
// }
// scene.GetScenePolicy().InterventionGame(scene, data)
// }
// return nil
// }
// return nil
//}))
//
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_DTRoomResults), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGRoomResults{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_DTRoomResults), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
// logger.Logger.Trace("SSPacketID_PACKET_WG_DTRoomResults Process recv:", pack)
// if msg, ok := pack.(*server.WGRoomResults); ok {
// scene := base.SceneMgrSington.GetScene(int(msg.GetRoomId()))
// if scene != nil {
// data := base.InterventionResults{
// Key: msg.GetDataKey(),
// Webuser: msg.GetWebuser(),
// Results: msg.GetResults(),
// }
// ret := scene.GetScenePolicy().InterventionGame(scene, data)
// if pack, ok := ret.(*server.GWRoomResults); ok {
// pack.DataKey = proto.String(msg.GetDataKey())
// } else {
// logger.Logger.Warn("Covert DTRoomResults scene packet game data error.")
// }
// scene.SendToWorld(int(server.SSPacketID_PACKET_GW_DTRoomResults), ret)
// }
// return nil
// }
// return nil
//}))
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_PlayerOnGameCount), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGPayerOnGameCount{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_PlayerOnGameCount), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
// logger.Logger.Trace("SSPacketID_PACKET_WG_PlayerOnGameCount Process recv ", pack)
// if msg, ok := pack.(*server.WGPayerOnGameCount); ok {
// base.CoinPoolMgr.LastDayDtCount = nil
// for _, value := range msg.GetDTCount() {
// base.CoinPoolMgr.LastDayDtCount = append(base.CoinPoolMgr.LastDayDtCount, int(value))
// }
// return nil
// }
// return nil
//}))
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_SyncPlayerSafeBoxCoin), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGSyncPlayerSafeBoxCoin{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_SyncPlayerSafeBoxCoin), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
// logger.Logger.Trace("WGSyncPlayerSafeBoxCoin Process recv ", pack)
// if msg, ok := pack.(*server.WGSyncPlayerSafeBoxCoin); ok {
// p := base.PlayerMgrSington.GetPlayerBySnId(msg.GetSnId())
// if p != nil {
// p.SafeBoxCoin = msg.GetSafeBoxCoin()
// }
// return nil
// }
// return nil
//}))
//更新俱乐部房间配置
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_CLUB_MESSAGE), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGClubMessage{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_CLUB_MESSAGE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
// logger.Logger.Trace("receive WGClubMessage:", pack)
// if msg, ok := pack.(*server.WGClubMessage); ok {
// sceneIds := msg.GetSceneIds()
// for _, id := range sceneIds {
// s := base.SceneMgrSington.GetScene(int(id))
// if s != nil {
// if msg.GetPumpCoin() > 0 {
// s.PumpCoin = int32(msg.GetPumpCoin())
// }
// if msg.GetDBGameFree() != nil {
// s.DbGameFree = msg.GetDBGameFree()
// }
// }
// }
// }
// return nil
//}))
//更新NiceId
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_GW_NICEIDREBIND), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGNiceIdRebind{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_GW_NICEIDREBIND), netlib.HandlerWrapper(func(s *netlib.Session,
// packetid int, pack interface{}) error {
// logger.Logger.Trace("receive WGNiceIdRebind:", pack)
// if msg, ok := pack.(*server.WGNiceIdRebind); ok {
// player := base.PlayerMgrSington.GetPlayerBySnId(msg.GetUser())
// if player != nil {
// player.NiceId = msg.GetNewId()
// }
// }
// return nil
//}))
//
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_INVITEROBENTERCOINSCENEQUEUE), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGInviteRobEnterCoinSceneQueue{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_INVITEROBENTERCOINSCENEQUEUE), netlib.HandlerWrapper(func(s *netlib.Session,
// packetid int, pack interface{}) error {
// logger.Logger.Trace("receive WGInviteRobEnterCoinSceneQueue:", pack)
// if msg, ok := pack.(*server.WGInviteRobEnterCoinSceneQueue); ok {
// base.NpcServerAgentSingleton.QueueInvite(msg.GetGameFreeId(), msg.GetPlatform(), msg.GetRobNum())
// }
// return nil
//}))
//
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_GAMEFORCESTART), netlib.PacketFactoryWrapper(func() interface{} {
return &server.WGGameForceStart{}
}))
netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_GAMEFORCESTART), netlib.HandlerWrapper(func(s *netlib.Session,
packetid int, pack interface{}) error {
logger.Logger.Trace("receive WGGameForceStart:", pack)
if msg, ok := pack.(*server.WGGameForceStart); ok {
scene := base.SceneMgrSington.GetScene(int(msg.GetSceneId()))
if scene != nil {
scene.GetScenePolicy().ForceStart(scene)
scene.NotifySceneRoundStart(1)
}
}
return nil
}))
//邀请机器人进比赛 //邀请机器人进比赛
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_INVITEMATCHROB), netlib.PacketFactoryWrapper(func() interface{} { netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_INVITEMATCHROB), netlib.PacketFactoryWrapper(func() interface{} {
return &server.WGInviteMatchRob{} return &server.WGInviteMatchRob{}
})) }))
netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_INVITEMATCHROB), netlib.HandlerWrapper(func(s *netlib.Session, netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_INVITEMATCHROB), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
packetid int, pack interface{}) error { logger.Logger.Trace("receive WGInviteMatchRob:", pack)
//logger.Logger.Trace("receive WGInviteMatchRob:", pack)
if msg, ok := pack.(*server.WGInviteMatchRob); ok { if msg, ok := pack.(*server.WGInviteMatchRob); ok {
base.NpcServerAgentSingleton.MatchInvite(msg.GetRoomId(), msg.GetMatchId(), msg.GetPlatform(), msg.GetRobNum(), msg.GetNeedAwait()) base.NpcServerAgentSingleton.MatchInvite(msg.GetRoomId(), msg.GetMatchId(), msg.GetPlatform(), msg.GetRobNum(), msg.GetNeedAwait())
} }
return nil return nil
})) }))
//比赛场底分变化
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_SCENEMATCHBASECHANGE), netlib.PacketFactoryWrapper(func() interface{} {
return &server.WGSceneMatchBaseChange{}
}))
netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_SCENEMATCHBASECHANGE), netlib.HandlerWrapper(func(s *netlib.Session,
packetid int, pack interface{}) error {
logger.Logger.Trace("WGSceneMatchBaseChange Process recv ", pack)
if msg, ok := pack.(*server.WGSceneMatchBaseChange); ok {
ids := msg.GetSceneIds()
for _, id := range ids {
s := base.SceneMgrSington.GetScene(int(id))
if s != nil {
if s.GetMatchChgData() == nil {
s.SetMatchChgData(&base.SceneMatchChgData{})
}
if s.GetMatchChgData() != nil {
s.GetMatchChgData().NextBaseScore = msg.GetBaseScore()
s.GetMatchChgData().NextOutScore = msg.GetOutScore()
}
}
}
}
return nil
}))
//玩家退赛
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_PLAYERQUITMATCH), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGPlayerQuitMatch{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_PLAYERQUITMATCH), netlib.HandlerWrapper(func(s *netlib.Session,
// packetid int, pack interface{}) error {
// logger.Logger.Trace("WGPlayerQuitMatch Process recv ", pack)
// if msg, ok := pack.(*server.WGPlayerQuitMatch); ok {
// p := base.PlayerMgrSington.GetPlayerBySnId(msg.GetSnId())
// if p == nil {
// return nil
// }
// scene := base.SceneMgrSington.GetScene(int(msg.GetSceneId()))
// if scene == nil {
// return nil
// }
// if scene.GetParamEx(common.PARAMEX_MATCH_COPYID) != msg.GetMatchId() {
// return nil
// }
// //if scene.mp != nil {
// // if scene.mp.OnMatchBreak(scene, p.pos) {
// // //base.PlayerMgrSington.DelPlayerBySnId(p.SnId)
// // //p.gateSess = nil
// // //p.worldSess = nil
// // //p.gateSid = 0
// // //p.sid = 0
// // p.SetIParam(common.PlayerIParam_IsQuit, 1)
// // p.MarkFlag(base.PlayerState_Leave)
// // p.MarkFlag(PlayerState_Auto)
// // p.MarkFlag(PlayerState_MatchQuit)
// // p.SyncFlag()
// // }
// //}
// }
// return nil
//}))
//玩家中转消息 //玩家中转消息
netlib.RegisterFactory(int(server.SSPacketID_PACKET_SS_REDIRECTTOPLAYER), netlib.PacketFactoryWrapper(func() interface{} { netlib.RegisterFactory(int(server.SSPacketID_PACKET_SS_REDIRECTTOPLAYER), netlib.PacketFactoryWrapper(func() interface{} {
return &server.SSRedirectToPlayer{} return &server.SSRedirectToPlayer{}
})) }))
netlib.RegisterHandler(int(server.SSPacketID_PACKET_SS_REDIRECTTOPLAYER), netlib.HandlerWrapper(func(s *netlib.Session, netlib.RegisterHandler(int(server.SSPacketID_PACKET_SS_REDIRECTTOPLAYER), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
packetid int, pack interface{}) error {
logger.Logger.Trace("SSRedirectToPlayer Process recv ", pack) logger.Logger.Trace("SSRedirectToPlayer Process recv ", pack)
if msg, ok := pack.(*server.SSRedirectToPlayer); ok { if msg, ok := pack.(*server.SSRedirectToPlayer); ok {
p := base.PlayerMgrSington.GetPlayerBySnId(msg.GetSnId()) p := base.PlayerMgrSington.GetPlayerBySnId(msg.GetSnId())
@ -825,111 +549,6 @@ func init() {
return nil return nil
})) }))
////同步玩家排名信息
//netlib.RegisterFactory(int(match.MatchPacketID_PACKET_SS_MATCH_PLAYERDATA), netlib.PacketFactoryWrapper(func() interface{} {
// return &match.SSMatchPlayerData{}
//}))
//netlib.RegisterHandler(int(match.MatchPacketID_PACKET_SS_MATCH_PLAYERDATA), netlib.HandlerWrapper(func(s *netlib.Session,
// packetid int, pack interface{}) error {
// logger.Logger.Trace("SSMatchPlayerData Process recv ", pack)
// if msg, ok := pack.(*match.SSMatchPlayerData); ok {
// scene := base.SceneMgrSington.GetScene(int(msg.GetSceneId()))
// if scene == nil {
// return nil
// }
// if !scene.IsMatchScene() {
// return nil
// }
// for _, mp := range msg.GetMatchPlayerData() {
// if data, ok := scene.Players[mp.GetSnId()]; ok {
// data.Iparams[common.PlayerIParam_MatchRank] = int64(mp.GetRank())
// }
// }
// }
// return nil
//}))
//由worldsrv通知gamesrv向玩家发送奖池信息
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_GAMEJACKPOT), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGGameJackpot{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_GAMEJACKPOT), netlib.HandlerWrapper(func(s *netlib.Session,
// packetid int, pack interface{}) error {
// logger.Logger.Trace("WGGameJackpot Process recv ", pack)
// if msg, ok := pack.(*server.WGGameJackpot); ok {
// sid := msg.GetSid()
// gateSid := msg.GetGateSid()
// platform := msg.GetPlatform()
// info := msg.GetInfo()
//
// var sessionId srvlib.SessionId
// sessionId.Set(gateSid)
// gateSess := srvlib.ServerSessionMgrSington.GetSession(int(sessionId.AreaId()), int(sessionId.SrvType()), int(sessionId.SrvId()))
// pack := &gamehall.SCHundredSceneGetGameJackpot{}
// for _, v := range info {
// if common.InSliceInt(base.BroadJackpotGame, int(v.GameId)) { //不是小游戏且需要广播游戏奖池
// jpfi := &gamehall.GameJackpotFundInfo{
// GameFreeId: proto.Int32(int32(v.GameFreeId)),
// }
//
// //
// str := base.XSlotsPoolMgr.GetPool(v.GetGameFreeId(), platform)
// if str != "" {
// jackpot := &base.XSlotJackpotPool{}
// err := json.Unmarshal([]byte(str), jackpot)
// if err == nil {
// jpfi.JackPotFund = jackpot.JackpotFund
// }
// }
//
// //初始化奖池金额
// if jpfi.JackPotFund == 0 {
// dbGameFree := srvdata.PBDB_GameFreeMgr.GetData(v.GameFreeId)
// if dbGameFree != nil {
// params := dbGameFree.GetJackpot()
// jpfi.JackPotFund = int64(params[0] * dbGameFree.GetBaseScore())
// }
// }
// pack.GameJackpotFund = append(pack.GameJackpotFund, jpfi)
// }
// }
//
// proto.SetDefaults(pack)
// common.SendToGate(sid, int(gamehall.HundredScenePacketID_PACKET_SC_GAMEJACKPOT), pack, gateSess)
// logger.Logger.Trace("SCHundredSceneGetGameJackpot:", pack)
// }
// return nil
//}))
//单控
//netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_SINGLEADJUST), netlib.PacketFactoryWrapper(func() interface{} {
// return &server.WGSingleAdjust{}
//}))
//netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_SINGLEADJUST), netlib.HandlerWrapper(func(s *netlib.Session,
// packetid int, pack interface{}) error {
// logger.Logger.Trace("WGSingleAdjust Process recv ", pack)
// if msg, ok := pack.(*server.WGSingleAdjust); ok {
// //修改内存
// sa := model.UnmarshalSingleAdjust(msg.PlayerSingleAdjust)
// if sa == nil {
// logger.Logger.Warn("WGSingleAdjust sa == nil")
// return nil
// }
// p := base.PlayerMgrSington.GetPlayerBySnId(sa.SnId)
// if p == nil {
// logger.Logger.Warn("WGSingleAdjust p == nil")
// return nil
// }
// switch msg.Option {
// case 1, 2:
// p.UpsertSingleAdjust(sa)
// case 3:
// p.DeleteSingleAdjust(sa.Platform, sa.GameFreeId)
// }
// }
// return nil
//}))
//玩家离开 //玩家离开
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_PlayerLEAVE), netlib.PacketFactoryWrapper(func() interface{} { netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_PlayerLEAVE), netlib.PacketFactoryWrapper(func() interface{} {
return &server.WGPlayerLeave{} return &server.WGPlayerLeave{}
@ -947,24 +566,4 @@ func init() {
} }
return nil return nil
})) }))
//黑白名单开关
netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_WBCtrlCfg), netlib.PacketFactoryWrapper(func() interface{} {
return &server.WbCtrlCfg{}
}))
netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_WBCtrlCfg), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
logger.Logger.Trace("receive WGPlayerLeaveGame")
if msg, ok := pack.(*server.WbCtrlCfg); ok {
for _, id := range msg.GameIds {
ss := base.SceneMgrSington.GetSceneByGameId(msg.Platform, id)
for _, scene := range ss {
scene.RealCtrl = msg.RealCtrl
scene.Novice = msg.Novice
scene.Welfare = msg.Welfare
scene.KillPoints = msg.KillPoints
}
}
}
return nil
}))
} }

2
public

@ -1 +1 @@
Subproject commit 67862903f1e3c74507a76ca3b3ae9003a50239db Subproject commit 88e683b711d026b70be3d549be3c0fb64ab44332

BIN
xlsx/DB_GameItem.xlsx
View File

Binary file not shown.