修改对战

dev/adapt/boxAdapt.lua

@@ -1,3 +1,11 @@
+--[[
+Descripttion:
+version:
+Author: Neo,Huang
+Date: 2023-11-17 22:23:09
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-17 23:23:51
+--]]
 -- 箱子配置
 local baseAdapt = require "base.baseAdapt"
 
@@ -70,6 +78,12 @@ function root:battle_is_box_list_valid(boxIdList)
     if is_empty(boxIdList) then
         return false
     end
+    -- 数量
+    local minCount = self:battle_const("battle_box_min")
+    local maxCount = self:battle_const("battle_box_max")
+    if #boxIdList < minCount or #boxIdList > maxCount then
+        return false
+    end
     for _, v in ipairs(boxIdList) do
         local conf = self:battle_get_box_key_info(v)
         if is_empty(conf) or is_empty(conf.price) then
@@ -79,4 +93,29 @@ function root:battle_is_box_list_valid(boxIdList)
     return true
 end
 
+-- 常量
+function root:battle_const(key)
+    if is_empty(key) then
+        return
+    end
+    local conf = baseAdapt:getConfig("BattleConstConfig")
+    for _, v in ipairs(conf) do
+        if v.main_key == key then
+            return v.value
+        end
+    end
+end
+
+-- 箱子物品列表
+function root:battle_get_box_item_list(boxId)
+    local confList = {}
+    local conf = baseAdapt:getConfig("BattleBoxAwardConfig")
+    for _, v in ipairs(conf) do
+        if v.boxId == boxId then
+            table.insert(confList, table.copy(v))
+        end
+    end
+    return confList
+end
+
 return root

dev/modules/battlerecord.lua

@@ -0,0 +1,36 @@
+--[[
+Descripttion:战斗记录
+version:
+Author: Neo,Huang
+Date: 2023-11-18 12:13:14
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-18 12:13:46
+--]]
+local root = class("battlerecord", require("base.baseModule"))
+
+function root:ctor(id)
+	root.super.ctor(self, id, "battlerecord", "id", true, false)
+	self.id = id
+end
+
+function root:mysql_get_init_columns()
+	return {
+		id = "bigint(20) NOT NULL COMMENT '邮件ID'",
+		roomId = "bigint(20) DEFAULT 0 COMMENT '房间号'",
+		battleBoxList = "json COMMENT '战斗箱子ID列表'",
+		createTime = "int(11) DEFAULT 0 COMMENT '房间创建时间'",
+		battleTime = "int(11) DEFAULT 0 COMMENT '战斗开始时间'",
+		battleId = "varchar(50) DEFAULT '' COMMENT '战斗编号'",
+		winUid = "int(11) DEFAULT 0 COMMENT '胜利玩家ID'",
+		totalPrice = "int(11) DEFAULT 0 COMMENT '掉落饰品总价格'",
+		battlePlayerList = "json COMMENT '战斗玩家列表'",
+		expireTime = "int(11) DEFAULT 0 COMMENT '过期时间'",
+		battleUid1 = "int(11) DEFAULT 0 COMMENT '战斗玩家ID'",
+		battleUid2 = "int(11) DEFAULT 0 COMMENT '战斗玩家ID'",
+		battleUid3 = "int(11) DEFAULT 0 COMMENT '战斗玩家ID'",
+		battleUid4 = "int(11) DEFAULT 0 COMMENT '战斗玩家ID'",
+		battleUid5 = "int(11) DEFAULT 0 COMMENT '战斗玩家ID'"
+	}
+end
+
+return root

dev/utils/util_battle.lua

@@ -0,0 +1,155 @@
+--[[
+Descripttion:战斗
+version:
+Author: Neo,Huang
+Date: 2023-11-18 12:21:05
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-18 12:26:57
+--]]
+local timeUtil = require("utils.timeUtil")
+local mysqlUtil = require("utils.mysqlUtil")
+local util_player = require("utils.util_player")
+
+local boxAdapt = require("adapt.boxAdapt")
+
+local root = {}
+
+-- 新增记录
+function root:add_battle_record(settle, totalPrice)
+    if is_empty(settle) then
+        return false
+    end
+    if
+        is_empty(settle.roomId) or is_empty(settle.battleBoxList) or is_empty(settle.createTime) or
+            is_empty(settle.battleTime) or
+            is_empty(settle.battleId) or
+            is_empty(settle.winUid) or
+            is_empty(settle.battlePlayerList)
+     then
+        return false
+    end
+    local expireTime = timeUtil.now() + timeUtil.SEC_PER_DAY * 365
+    local columns =
+        "`roomId`,`battleBoxList`,`createTime`,`battleTime`,`battleId`,`winUid`,`totalPrice`,`battlePlayerList`,`expireTime`"
+    local values =
+        string.format(
+        "%s,'%s',%s,%s,'%s',%s,%s,'%s',%s",
+        tostring(settle.roomId),
+        cjson_encode(settle.battleBoxList),
+        tostring(settle.createTime),
+        tostring(settle.battleTime),
+        tostring(settle.battleId),
+        tostring(settle.winUid),
+        tostring(totalPrice),
+        cjson_encode(settle.battlePlayerList),
+        tostring(expireTime)
+    )
+    for k, v in ipairs(settle.battlePlayerList) do
+        local key = string.format("`battleUid%s`", tostring(k))
+        columns = columns .. "," .. key
+        values = values .. string.format(",%s", tostring(v.uid))
+    end
+
+    local sql = string.format("INSERT INTO `mdl_battlerecord` (%s) VALUES (%s); ", columns, values)
+
+    local ok = mysqlUtil:insert(sql)
+    log.info("add_battle_record sql[%s] ok[%s]", tostring(sql), tostring(ok))
+    return ok
+end
+
+-- 打包历史战绩
+function root:pack_battle_record_list(data)
+    local list = {}
+    if is_empty(data) then
+        return list
+    end
+    for _, v in ipairs(data) do
+        -- 房间信息
+        local roomInfo = {
+            roomId = tonumber(v.roomId),
+            battleBoxList = cjson_decode(v.battleBoxList),
+            status = 2,
+            createTime = tonumber(v.createTime),
+            battleTime = tonumber(v.battleTime),
+            playerList = {}
+        }
+        -- 战斗玩家列表
+        local battlePlayerList = cjson_decode(v.battlePlayerList)
+        for _, _v in ipairs(battlePlayerList) do
+            local info = {
+                playerInfo = util_player:get_base_info(v.uid),
+                seatId = _v.seatId
+            }
+            table.insert(roomInfo.playerList, info)
+        end
+        local info = {
+            roomInfo = roomInfo,
+            battleId = v.battleId,
+            winUid = tonumber(v.winUid),
+            battlePlayerList = battlePlayerList
+        }
+        table.insert(list, info)
+    end
+    return list
+end
+
+-- 获取精彩对战记录
+function root:get_brilliant_record_list()
+    local minTotalPrice = boxAdapt:battle_const("battle_box_open_total_price_is_exciting_battle") or 10000
+    local count = boxAdapt:battle_const("exciting_battle_record_num") or 20
+    local sql =
+        string.format(
+        "SELECT * FROM `mdl_battlerecord` WHERE `totalPrice`>=%s ORDER BY battleTime DESC limit %s",
+        tostring(minTotalPrice),
+        tostring(count)
+    )
+    local ok, ret = mysqlUtil:select(sql)
+    if not ok or is_empty(ret) then
+        return
+    end
+    return self:pack_battle_record_list(ret)
+end
+
+-- 获取对战记录
+function root:get_record_list(lastTime)
+    lastTime = lastTime or timeUtil.now()
+    local count = 20
+    local sql =
+        string.format(
+        "SELECT * FROM `mdl_battlerecord` WHERE `battleTime`<%s ORDER BY battleTime DESC limit %s",
+        tostring(lastTime),
+        tostring(count)
+    )
+    local ok, ret = mysqlUtil:select(sql)
+    if not ok or is_empty(ret) then
+        return
+    end
+    return self:pack_battle_record_list(ret)
+end
+
+-- 获取玩家个人对战记录
+function root:get_player_record_list(uid, lastTime)
+    if is_empty(uid) then
+        return
+    end
+    lastTime = lastTime or timeUtil.now()
+    local count = 20
+    local sql =
+        string.format(
+        "SELECT * FROM `mdl_battlerecord` WHERE `battleTime`<%s and (`battleUid1`=%s or `battleUid2`=%s or `battleUid3`=%s or `battleUid4`=%s or `battleUid5`=%s) ORDER BY battleTime DESC limit %s",
+        tostring(lastTime),
+        tostring(uid),
+        tostring(uid),
+        tostring(uid),
+        tostring(uid),
+        tostring(uid),
+        tostring(count)
+    )
+    local ok, ret = mysqlUtil:select(sql)
+    if not ok or is_empty(ret) then
+        return
+    end
+    return self:pack_battle_record_list(ret)
+end
+
+return root

dev/utils/util_box.lua

@@ -117,7 +117,7 @@ function root:dream_add_record(uid, itemId, odds, dropItem, isWin)
     end
 
     local dropTime = timeUtil.now()
-    local expireTime = dropItem + timeUtil.SEC_PER_DAY * 365
+    local expireTime = dropTime + timeUtil.SEC_PER_DAY * 365
     local sql =
         string.format(
         "INSERT INTO `mdl_dream` (`uid`,`itemId`,`dropItem`,`price`,`odds`,`isWin`,`dropTime`,`expireTime`)" ..
@@ -242,4 +242,25 @@ function root:dream_del_day_statement(ti)
     lib_game_redis:del(key)
 end
 
+----------------------------------------
+-- 对战
+----------------------------------------
+-- 获取开箱物品
+function root:battle_get_box_drop_item_and_count(boxId)
+    local confList = boxAdapt:battle_get_box_item_list(boxId)
+    if is_empty(confList) then
+        return
+    end
+    -- 更新权重
+    for _, v in ipairs(confList) do
+        v.weight = 0
+        local price = resAdapt:get_item_price(v.itemId)
+        if not is_empty(price) then
+            v.weight = math.floor(v.weightByPrice / price)
+        end
+    end
+    local index = random_list_by_weight(confList)
+    return confList[index].itemId, confList[index].count
+end
+
 return root

dev/utils/util_match.lua

@@ -10,9 +10,16 @@ local lib_battle_redis = require("lib_battle_redis")
 local timeUtil = require("utils.timeUtil")
 local redisBattleUtil = require("redisBattleUtil")
 local util_player = require("utils.util_player")
+local util_box = require("utils.util_box")
+local gameConst = require("const.gameConst")
+local util_user = require("utils.util_user")
+local nodeMgr = require("nodeMgr")
+local util_battle = require("utils.util_battle")
 
 local battleData = require("data.battle")
+local bagData = require("data.bag")
 local boxAdapt = require("adapt.boxAdapt")
+local resAdapt = require("adapt.resAdapt")
 
 local root = {}
 
@@ -349,12 +356,15 @@ function root:is_wait_battle_end(roomId)
     end
     local currTime = timeUtil.now()
     local createTime = redisBattleUtil.hget_int(key, "createTime")
-    local waitSeconds = 10
+    local waitSeconds = boxAdapt:battle_const("no_full_close_room_time") or 10
     if currTime < createTime + waitSeconds then
         return false
     end
     return true
 end
+----------------------------------------
+-- 战斗
+---------------------------------------
 -- 房间是否开始战斗
 function root:is_room_start_battle(roomId)
     local status = self:get_room_status(roomId)
@@ -372,8 +382,123 @@ function root:is_room_start_battle(roomId)
     local playCount = redisBattleUtil.hget_int(key, "playCount")
     return seatCount >= playCount
 end
+-- 生成战斗编号
+function root:gen_battle_id(roomId)
+    local currTime = timeUtil.now()
+    return string.format("BT%s%08d", os.date("%Y%m%d", currTime), roomId)
+end
+-- 战斗
+function root:start_battle(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
+    -- 更新状态
+    redisBattleUtil.hset(key, "status", 1)
+    local battleId = self:gen_battle_id(roomId)
+    local battleBoxList = redisBattleUtil.hget_json(key, "boxIdList")
+    local playerList = redisBattleUtil.hget_json(key, "playerList")
+    -- 射击轮次
+    local rounds = {}
+    local totalPrice = 0
+    for k, v in ipairs(battleBoxList) do
+        local roundInfo = {round = k, shotList = {}}
+        for _, _v in ipairs(playerList) do
+            if _v.seatId and _v.seatId > 0 then
+                local itemId = util_box:battle_get_box_drop_item_and_count(v)
+                local price = resAdapt:get_item_price(itemId)
+                local shotInfo = {
+                    uid = _v.uid,
+                    itemId = itemId,
+                    price = price
+                }
+                table.insert(roundInfo.shotList, shotInfo)
+
+                totalPrice = totalPrice + price
+            end
+        end
+        table.insert(rounds, roundInfo)
+    end
+    -- 胜利玩家
+    local mapUidPrice = {}
+    for _, v in ipairs(rounds) do
+        for _, _v in ipairs(v.shotList) do
+            mapUidPrice[_v.uid] = (mapUidPrice[_v.uid] or 0) + _v.price
+        end
+    end
+    local winUid = nil
+    local maxPrice = nil
+    for uid, price in pairs(mapUidPrice) do
+        if maxPrice == nil or price > maxPrice then
+            winUid = uid
+        end
+    end
+    -- 战斗玩家列表
+    local n1Price = resAdapt:get_item_price(gameConst.ITEM_ID.N1)
+    local battlePlayerList = {}
+    for _, v in ipairs(playerList) do
+        if v.seatId and v.seatId > 0 then
+            if v.uid == winUid then
+                -- 收集所有玩家射击
+                local info = {uid = v.uid, seatId = v.seatId, shotList = {}}
+                for _, _v in ipairs(rounds) do
+                    for _, __v in ipairs(_v.shotList) do
+                        table.insert(info.shotList, {itemId = __v.itemId, price = __v.price})
+                    end
+                end
+                table.insert(battlePlayerList, info)
+            else
+                -- 安慰奖
+                local info = {
+                    uid = v.uid,
+                    seatId = v.seatId,
+                    shotList = {{itemId = gameConst.ITEM_ID.N1, price = n1Price}}
+                }
+                table.insert(battlePlayerList, info)
+            end
+        end
+    end
+    -- 发放奖励
+    for _, v in ipairs(battleBoxList) do
+        local items = {}
+        for _, _v in ipairs(v.shotList) do
+            table.insert(items, {id = v.itemId, count = 1})
+        end
+        local keyEvent = string.format("battle-settle-%s-%s", battleId, tostring(v.uid == winUid and 1 or 0))
+        bagData:add_items(v.uid, items, keyEvent)
+    end
+
+    redisBattleUtil.hset(key, "status", 2)
+    local settle = {
+        roomInfo = self:pack_room_info(roomId),
+        winUid = winUid,
+        battleId = battleId,
+        rounds = rounds,
+        battlePlayerList = battlePlayerList
+    }
+    -- 通知所有房间玩家
+    for _, v in ipairs(playerList) do
+        util_user:user_proto_notify(v.uid, "on_room_battle_settle", {settle = settle})
+    end
+    -- 新增战斗记录
+    util_battle:add_battle_record(settle, totalPrice)
+    -- 关闭房间
+    -- 删除房间信息
+    lib_battle_redis:del(key)
+    -- 从活跃房间集合删除
+    lib_battle_redis:sismerber(_get_active_room_id_key(), roomId)
+    -- 通知在线玩家 - 销毁房间
+    nodeMgr.broadcast_proto_notify("on_room_destroy", {roomId = roomId})
+end
 ----------------------------------------
+-- 玩家战斗信息
 ----------------------------------------
 local bagData = require("data.bag")
 -- 绑定房间

nodes/game/interface/room.lua

@@ -11,6 +11,7 @@ local util_match = require("utils.util_match")
 local gameConst = require("const.gameConst")
 local nodeMgr = require("nodeMgr")
 local nodeUtil = require("utils.nodeUtil")
+local util_battle = require("utils.util_battle")
 
 local boxAdapt = require("adapt.boxAdapt")
 local bagData = require("data.bag")
@@ -37,6 +38,12 @@ function root:room_create_room(role, msg)
     if not boxAdapt:battle_is_box_list_valid(battleBoxList) then
         return code.UNKNOWN
     end
+    -- 对战人数限制
+    local minPlayCount = boxAdapt:battle_const("min_play_count") or 2
+    local maxPlayCount = boxAdapt:battle_const("max_play_count") or 3
+    if playCount < minPlayCount or playCount > maxPlayCount then
+        return code.UNKNOWN
+    end
     -- 消耗
     local price = boxAdapt:battle_get_box_price(battleBoxList)
     local ok, costItems = bagData:is_enough(uid, {{id = gameConst.ITEM_ID.DIAMOND, count = price}})
@@ -174,4 +181,24 @@ function root:room_player_leave(role, msg)
     return code.OK
 end
 
+-- 获取房间对战记录列表 - 每次请求返回20条
+function root:room_get_record_list(role, msg)
+    local lastTime = msg.lastTime
+    local list = util_battle:get_record_list(lastTime)
+    return code.OK, {list = list}
+end
+
+-- 获取玩家个人对战记录 - 每次请求返回20条
+function root:room_get_player_record_list(role, msg)
+    local lastTime = msg.lastTime
+    local list = util_battle:get_player_record_list(role.uid, lastTime)
+    return code.OK, {list = list}
+end
+
+-- 获取精彩对战记录列表 - 仅返回当前最近20(配置)条记录
+function root:room_get_brilliant_record_list(role, msg)
+    local list = util_battle:get_brilliant_record_list()
+    return code.OK, {list = list}
+end
+
 return root

nodes/global/main.lua

@@ -1,9 +1,10 @@
 --[[
-Author: zkj
-Date: 2021-06-24 10:54:08
-LastEditTime: 2021-07-13 17:00:28
-LastEditors: Please set LastEditors
-Description: 全局业务服
+Descripttion:全局业务服
+version:
+Author: Neo,Huang
+Date: 2023-11-16 21:45:09
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-18 13:58:16
 --]]
 local skynet = require "skynet"
 require "skynet.manager"
@@ -26,6 +27,7 @@ skynet.start(
         skynet.uniqueservice("backupSrv")
         skynet.uniqueservice("mailSrv")
         skynet.uniqueservice("dreamSrv")
+        skynet.uniqueservice("battlerecordSrv")
 
         -- 集群
         init_nodes:init_cluster()

nodes/global/service/battlerecordSrv.lua

@@ -0,0 +1,34 @@
+--[[
+Descripttion:战斗记录
+version:
+Author: Neo,Huang
+Date: 2023-11-18 13:56:05
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-18 13:57:08
+--]]
+local timer = require("timer")
+local baseService = require("baseService")
+local lib_game_mysql = require("lib_game_mysql")
+
+local timerDelExpire = nil
+
+local CMD = {}
+
+-- 清理过期追梦记录
+local function l_del_expire_record()
+	local currTime = skynet_time()
+	local sql = string.format("delete from mdl_battlerecord where expireTime >0 and expireTime < %s;", tostring(currTime))
+	local ret = lib_game_mysql:query(sql)
+	log.info("l_del_expire_record sql[%s] ret[%s]", tostring(sql), tostring(ret))
+end
+
+function CMD.onStart()
+	timerDelExpire = timer.timeOut(60, l_del_expire_record)
+end
+
+function CMD.onStop()
+	-- 取消定时器
+	timerDelExpire.func = nil
+end
+
+baseService.start(CMD, ".battlerecordCenter", true)

nodes/match/service/srvRoom.lua

@@ -10,6 +10,8 @@ local code = require("code")
 local baseService = require("baseService")
 local util_match = require("utils.util_match")
 local util_user = require("utils.util_user")
+local nodeMgr = require("nodeMgr")
+local gameConst = require("const.gameConst")
 
 local battleData = require("data.battle")
 local bagData = require("data.bag")
@@ -116,6 +118,11 @@ function root.seat_down(uid, roomId, seatId)
         changeRoomPlayer = {util_match:pack_room_player_info(roomId, uid)}
     }
     nodeMgr.broadcast_proto_notify("on_room_player_change", pack)
+
+    -- 是否开始战斗
+    if util_match:is_room_start_battle(roomId) then
+        util_match:start_battle(roomId)
+    end
 end
 
 function root.onStart()