战场开房，初步逻辑

common/core/nodeMgr.lua

@@ -113,10 +113,27 @@ function root.broadcast_game_agent(mdl, cmd, ...)
 		return
 	end
 	for _, v in ipairs(nodeInfoList) do
-		root.send(v, ".srvAgentMgr", "broadcast_agents", mdl, cmd, ...)
+		root.send(v.nodeName, ".srvAgentMgr", "broadcast_agents", mdl, cmd, ...)
 	end
 end
 
+-- 广播
+function root:broadcast_proto_notify(protoName, msg)
+	if protoName == nil then
+		log.error("广播消息推送失败 protoName[%s]", tostring(protoName))
+		return false
+	end
+	local nodeInfoList = root.get_type_node_list("gate")
+	if is_empty(nodeInfoList) then
+		return false
+	end
+	for _, v in ipairs(nodeInfoList) do
+		root.send(v.nodeName, ".wsSprotoWatchdog", "s2c_broadcast", protoName, msg)
+	end
+
+	return true
+end
+
 -- 获取某种类型的所有节点
 function root.get_type_node_list(nodeType)
 	local ok, nodes = root.call("master", ".srvNodeMgr", "get_type_node_list", tostring(nodeType))

common/db/lib_battle_redis.lua

@@ -0,0 +1,11 @@
+--[[
+Descripttion:战斗
+version:
+Author: Neo,Huang
+Date: 2023-11-16 23:08:53
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-16 23:10:13
+--]]
+local rpcRedis = require "rpcRedis"
+
+return rpcRedis.get_redis("game")

dev/utils/util_global.lua

@@ -2,9 +2,9 @@
 Descripttion:全局
 version:
 Author: Neo,Huang
-Date: 2022-07-05 19:59:16
+Date: 2023-11-15 22:34:35
 LastEditors: Neo,Huang
-LastEditTime: 2022-07-05 20:08:31
+LastEditTime: 2023-11-16 23:30:37
 --]]
 local lib_game_redis = require("lib_game_redis")
 local lib_game_mysql = require("lib_game_mysql")
@@ -17,10 +17,11 @@ local root = {}
 
 -- 创建玩家id
 function root:gen_user_id()
-    local uid = lib_game_redis:hincrby(MODULE_NAME, "user:max:id", 1)
+    local subKey = "user:max:id"
+    local uid = lib_game_redis:hincrby(MODULE_NAME, subKey, 1)
     if uid < 1000000 then
         uid = uid + 1000000
-        lib_game_redis:set("user:max:id", uid)
+        lib_game_redis:hset(MODULE_NAME, subKey, uid)
     end
 
     return uid

dev/utils/util_match.lua

@@ -0,0 +1,113 @@
+--[[
+Descripttion:战斗房间
+version:
+Author: Neo,Huang
+Date: 2023-11-16 23:24:42
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-16 23:25:34
+--]]
+local lib_battle_redis = require("lib_battle_redis")
+local timeUtil = require("utils.timeUtil")
+
+local root = {}
+
+local function _get_global_room_key()
+    return "global:room"
+end
+local function _get_room_key(id)
+    return string.format("room:%s", tostring(id))
+end
+local function _get_active_room_id_key()
+    return "active:rooms"
+end
+
+-- 分配房间ID
+function root:gen_room_id()
+    local key = _get_global_room_key()
+    local subKey = "max:room:id"
+
+    local id = lib_battle_redis:hincrby(key, subKey, 1)
+    if id > 200000000 then
+        id = 1
+        lib_battle_redis:hset(key, subKey, id)
+    end
+
+    return id
+end
+
+-- 获取当前活跃房间ID列表
+function root:get_active_room_id_list()
+    local key = _get_active_room_id_key()
+    return lib_battle_redis:smembers(key)
+end
+-- 创建房间
+function root:create_match(uid, playCount, boxIdList)
+    if is_empty(uid) then
+        return false
+    end
+    if is_empty(playCount) or playCount < 2 or playCount > 3 then
+        return false
+    end
+    if is_empty(boxIdList) or #boxIdList < 1 then
+        return false
+    end
+    local roomId = self:gen_room_id()
+    -- 设置房间信息
+    local playerList = {{uid = uid, seat = 1, status = 1}}
+    local key = _get_room_key(roomId)
+    lib_battle_redis:hset(key, "createTime", timeUtil.now()) -- 创建时间
+    lib_battle_redis:hset(key, "hostUid", uid) -- 房主
+    lib_battle_redis:hset(key, "playCount", playCount) -- 战斗人数
+    lib_battle_redis:hset(key, "boxIdList", boxIdList) -- 战斗箱子ID列表
+    lib_battle_redis:hset(key, "playerList", playerList) -- 玩家列表
+    lib_battle_redis:hset(key, "status", 0) -- 战斗状态
+    -- 房间进入准备战斗集合
+    key = _get_active_room_id_key()
+    lib_battle_redis:sadd(key, roomId)
+    return true
+end
+-- 销毁房间
+function root:destroy_room(roomId)
+    if is_empty(roomId) then
+        return false
+    end
+    local key = _get_room_key(roomId)
+    -- 房间是否存在
+    local isExist = lib_battle_redis:exists(key)
+    if not isExist then
+        -- 从活跃房间集合删除
+        lib_battle_redis:sismerber(_get_active_room_id_key(), roomId)
+        return false
+    end
+    local status = lib_battle_redis:hget(key, "status")
+    if tonumber(status) >= 0 then
+        -- 战斗已开始
+        return false
+    end
+    -- 删除房间信息
+    lib_battle_redis:del(key)
+    -- 从活跃房间集合删除
+    lib_battle_redis:sismerber(_get_active_room_id_key(), roomId)
+    return true
+end
+-- 是否等待开战结束
+function root:is_wait_battle_end(roomId)
+    if is_empty(roomId) then
+        return false
+    end
+    local key = _get_room_key(roomId)
+    -- 房间是否存在
+    local isExist = lib_battle_redis:exists(key)
+    if not isExist then
+        return true
+    end
+    local currTime = timeUtil.now()
+    local createTime = lib_battle_redis:hget(key, "createTime")
+    local waitSeconds = 10
+    if currTime < createTime + waitSeconds then
+        return false
+    end
+    return true
+end
+
+return root

dev/utils/util_user.lua

@@ -48,7 +48,7 @@ function root:user_proto_notify(uid, protoName, msg)
     end
     local nodeInfo = self:user_get_cluster_info(uid, "gate")
     if nodeMgr.is_node_info_valid(nodeInfo) then
-        nodeMgr.send_with_node_info(nodeInfo, "pushS2C", uid, protoName, msg)
+        nodeMgr.send_with_node_info(nodeInfo, "s2c", uid, protoName, msg)
         return true
     else
         log.error("玩家消息推送失败 uid[%s] nodeInfo[%s] protoName[%s]", tostring(uid), tostring(nodeInfo), tostring(protoName))

nodes/gate/service/srvSprotoAgent.lua

@@ -160,6 +160,13 @@ function CMD.s2c(uid, name, msg)
     local rs = protoUtil:encode_s2c_req(name, msg)
     skynet.send(GATE, "lua", "send_to_client", fd, rs)
 end
+-- 向所有玩家发消息
+function CMD.s2c_broadcast(name, msg)
+    local rs = protoUtil:encode_s2c_req(name, msg)
+    for fd, _ in pairs(mapFd) do
+        skynet.send(GATE, "lua", "send_to_client", fd, rs)
+    end
+end
 
 -- 回应客户端请求
 function CMD.c2s_response(uid, name, msg, session, ud)

nodes/gate/service/wsSprotoWatchdog.lua

@@ -236,6 +236,14 @@ end
 function CMD.update_logic()
 end
 
+-- 广播协议
+function CMD.s2c_broadcast(protoName, msg)
+	local addrList = pool:get_agent_srv_addr_list()
+	for _, v in pairs(addrList) do
+		skynet.send(v, "lua", "s2c_broadcast", protoName, msg)
+	end
+end
+
 skynet.start(
 	function()
 		skynet.dispatch(

nodes/global/service/dreamSrv.lua

@@ -2,9 +2,9 @@
 Descripttion:追梦
 version:
 Author: Neo,Huang
-Date: 2022-08-17 16:04:20
+Date: 2023-11-16 21:45:09
 LastEditors: Neo,Huang
-LastEditTime: 2022-08-20 15:18:25
+LastEditTime: 2023-11-16 23:20:12
 --]]
 local timer = require("timer")
 local baseService = require("baseService")
@@ -27,7 +27,7 @@ local function l_del_expire_record()
 end
 
 function CMD.onStart()
-	timerDelExpireMail = timer.timeOut(60, l_del_expire_mail)
+	timerDelExpireMail = timer.timeOut(60, l_del_expire_record)
 end
 
 function CMD.onStop()

nodes/master/service/srvNodeMgr.lua

@@ -94,7 +94,7 @@ function root.user_dispatch_cluster_node(uid, clusterName)
 end
 
 -- 获取集群节点列表
-function root.get_cluster_node_info_list(clusterName)
+function root.get_type_node_list(clusterName)
 	return root.mapCluster[clusterName]
 end
 

nodes/match/main.lua

@@ -0,0 +1,36 @@
+--[[
+Author: zkj
+Date: 2021-05-28 15:20:17
+LastEditTime: 2021-06-01 10:46:01
+LastEditors: Please set LastEditors
+Description: 游戏匹配服
+FilePath: /ux4-server/servers/match/main.lua
+--]]
+local skynet = require "skynet"
+require "skynet.manager"
+local init_nodes = require("init_nodes")
+
+skynet.start(
+    function()
+        -- 初始化控制台
+        init_nodes:init_console()
+
+        -- 数据库
+        init_nodes:init_mysql()
+        -- redis
+        init_nodes:init_redis()
+        -- 日志
+        init_nodes:init_logger()
+        -- 配置
+        init_nodes:init_config()
+
+        skynet.uniqueservice("srvMatchMgr")
+
+        -- 集群
+        init_nodes:init_cluster()
+
+        skynet.send(".steward", "lua", "pingMaster", "battle_master")
+
+        skynet.exit()
+    end
+)

nodes/match/service/srvMatch.lua

@@ -0,0 +1,43 @@
+--[[
+Descripttion:房间管理
+version:
+Author: Neo,Huang
+Date: 2023-11-16 22:19:05
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-16 23:19:50
+--]]
+local timer = require("timer")
+local baseService = require("baseService")
+local util_match = require("utils.util_match")
+
+local timerDestroyRoom = nil
+
+local CMD = {}
+
+-- 关闭超时未开始战斗房间
+local function _destroy_room()
+    local activeRoomIdList = util_match:get_active_room_id_list()
+    if is_empty(activeRoomIdList) then
+        return
+    end
+    for _, v in ipairs(activeRoomIdList) do
+        local roomId = tonumber(v)
+        -- 是否等待开始战斗结束
+        if util_match:is_wait_battle_end(roomId) then
+            -- TODO:通知在线玩家 - 销毁房间
+            -- 删除房间信息
+            util_match:destroy_room(roomId)
+        end
+    end
+end
+
+function CMD.onStart()
+    timerDestroyRoom = timer.timeOut(1, _destroy_room)
+end
+
+function CMD.onStop()
+    -- 取消定时器
+    timerDestroyRoom.func = nil
+end
+
+baseService.start(CMD, ".srvMatch", true)

run/ali-test/db.lua

@@ -2,9 +2,9 @@
 Descripttion:
 version:
 Author: Neo,Huang
-Date: 2022-07-05 10:54:51
+Date: 2023-11-08 22:38:51
 LastEditors: Neo,Huang
-LastEditTime: 2022-07-05 10:56:51
+LastEditTime: 2023-11-16 23:08:30
 --]]
 local root = {
     mysql = {},
@@ -38,4 +38,20 @@ root["redis"]["game"] = {
     }
 }
 
+-- 战斗redis
+root["redis"]["battle"] = {
+    {
+        host = "127.0.0.1",
+        port = 6381,
+        db = 1,
+        auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
+    },
+    {
+        host = "127.0.0.1",
+        port = 6381,
+        db = 1,
+        auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
+    }
+}
+
 return root

run/neo-test1/db.lua

@@ -2,9 +2,9 @@
 Descripttion:
 version:
 Author: Neo,Huang
-Date: 2022-07-05 10:54:51
+Date: 2023-11-08 22:38:51
 LastEditors: Neo,Huang
-LastEditTime: 2022-07-05 10:56:51
+LastEditTime: 2023-11-16 23:08:03
 --]]
 local root = {
     mysql = {},
@@ -38,4 +38,20 @@ root["redis"]["game"] = {
     }
 }
 
+-- 战斗redis
+root["redis"]["battle"] = {
+    {
+        host = "127.0.0.1",
+        port = 6381,
+        db = 1,
+        auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
+    },
+    {
+        host = "127.0.0.1",
+        port = 6381,
+        db = 1,
+        auth = "aGMtbmVvLWRldi0yMDIzMDQwNw=="
+    }
+}
+
 return root