diff --git a/etcd/keyconf.go b/etcd/keyconf.go index f13819d..8adc927 100644 --- a/etcd/keyconf.go +++ b/etcd/keyconf.go @@ -30,19 +30,19 @@ const ( ETCDKEY_PLAYERPOOL = "/game/plt/playerpool/" // 个人水池调控配置 ETCDKEY_GAME_CONFIG = "/game/plt/gameconfig/" // 游戏管理/全局配置 ETCDKEY_ACT_PHONELOTTERY = "/game/act_phoneLottery" - ETCDKEY_ChannelSwitch = "/game/channel/switch" // 渠道开关 - ETCDKEY_ACT_Invite = "/game/act_invite" // 邀请活动配置 - ETCDKEY_ACT_Permit = "/game/act_permit" // 赛季通行证配置 - ETCDKEY_DIAMOND_LOTTERY = "/game/diamond_lottery" // 钻石抽奖配置 - ETCDKEY_Item = "/game/item" // 道具列表 - ETCDKEY_SKin = "/game/skin_config" // 皮肤配置 - ETCDKEY_RANK_TYPE = "/game/RankType" // 排行榜奖励配置 - ETCDKEY_AWARD_CONFIG = "/game/awardlog_config" //获奖记录 - ETCDKEY_GUIDE = "/game/guide_config" //新手引导配置 - ETCDKEY_MACHINE = "/game/machine_config" //娃娃机配置 - ETCDKEY_MatchAudience = "/game/match_audience" //比赛观众 - ETCDKEY_Spirit = "/game/spirit" // 小精灵配置 - ETCDKEY_RoomType = "/game/room_type" // 房间类型配置 - ETCDKEY_RoomConfig = "/game/room_config" // 房间配置 - ETCDKEY_RoomConfigSystem = "/game/system_room_config" // 系统房间配置 + ETCDKEY_ChannelSwitch = "/game/channel/switch" // 渠道开关 + ETCDKEY_ACT_Invite = "/game/act_invite" // 邀请活动配置 + ETCDKEY_ACT_Permit = "/game/act_permit" // 赛季通行证配置 + ETCDKEY_DIAMOND_LOTTERY = "/game/diamond_lottery" // 钻石抽奖配置 + ETCDKEY_Item = "/game/item" // 道具列表 + ETCDKEY_SKin = "/game/skin_config" // 皮肤配置 + ETCDKEY_RANK_TYPE = "/game/RankType" // 排行榜奖励配置 + ETCDKEY_AWARD_CONFIG = "/game/awardlog_config" //获奖记录 + ETCDKEY_GUIDE = "/game/guide_config" //新手引导配置 + ETCDKEY_MACHINE = "/game/machine_config" //娃娃机配置 + ETCDKEY_MatchAudience = "/game/match_audience" //比赛观众 + ETCDKEY_Spirit = "/game/spirit" // 小精灵配置 + ETCDKEY_RoomType = "/game/room_type" // 房间类型配置 + ETCDKEY_RoomConfig = "/game/room_config" // 房间配置 + ETCDKEY_RoomConfigSystem = "/game/room_system" // 系统房间配置 ) diff --git a/gamerule/chess/constants.go b/gamerule/chess/constants.go index 9341718..e7af063 100644 --- a/gamerule/chess/constants.go +++ b/gamerule/chess/constants.go @@ -39,6 +39,7 @@ const ( PlayerOpStep //6,计步操作(1 开始,0结束) PlayerOpDraw //7,求和 1请求求和 2拒绝求和 3同意求和 PlayerOpNextPlay //8,再来一局 + PlayerOpWin //9,胜利 // 人机对战操作 PlayerOpAISwitch //9,ai开关 0关闭 1开启 diff --git a/gamesrv/chess/scenepolicy.go b/gamesrv/chess/scenepolicy.go index 9e24ec8..95084c5 100644 --- a/gamesrv/chess/scenepolicy.go +++ b/gamesrv/chess/scenepolicy.go @@ -1130,6 +1130,20 @@ func (this *SceneStatePlayerOp) OnPlayerOpNormal(s *base.Scene, p *base.Player, case rule.PlayerOpTest: // 测试 强制同步给所有的玩家 returnFunc(chesstitians.OpResultCode_OPRC_Sucess) return true + case rule.PlayerOpWin: + if common.Config.IsDevMode { + for _, seat := range sceneEx.seats { + if seat != nil { + if seat.GetSnId() == playerEx.GetSnId() { + sceneEx.winSnId = seat.GetSnId() + break + } + } + } + returnFunc(chesstitians.OpResultCode_OPRC_Sucess) + } + return true + } return true } diff --git a/worldsrv/etcd.go b/worldsrv/etcd.go index 240d460..2ec4410 100644 --- a/worldsrv/etcd.go +++ b/worldsrv/etcd.go @@ -93,6 +93,8 @@ func init() { etcd.Register(etcd.ETCDKEY_Spirit, webapi.SpiritConfig{}, platformConfigEvent) // 竞技馆房间配置 etcd.Register(etcd.ETCDKEY_RoomConfig, webapi.RoomConfig{}, handlerEvent) + // 竞技馆系统房间配置 + etcd.Register(etcd.ETCDKEY_RoomConfigSystem, webapi.RoomConfigSystem{}, handlerEvent) // 竞技馆房间类型配置 etcd.Register(etcd.ETCDKEY_RoomType, webapi.RoomType{}, handlerEvent) //娃娃机配置