删除节点

common/core/nodeMgr.lua

@@ -143,28 +143,6 @@ function root.get_type_node_list(nodeType)
 	return nodes
 end
 
-function root.dispatch_battle_node_and_agent()
-	local ok, server = root.call("battlemaster", ".srvNodeMgr", "dispatch_battle_node")
-	if not ok or server == nil then
-		return
-	end
-	if is_empty(server.battleNode) or server.battleId == nil then
-		log.error(string.format("分配对战服失败, newBattleId=%s", server.battleId))
-		return
-	end
-
-	local ok, handle = root.call(server.battleNode, ".BattleMgr", "getBattleAgent")
-	if not ok or handle == nil then
-		return
-	end
-	local info = {}
-	info.nodeName = server.battleNode
-	info.agent = handle
-	info.battleId = server.battleId
-	return info
-end
-
 -- 节点信息是否合法
 function root.is_node_info_valid(nodeInfo)
 	if nodeInfo == nil then

dev/utils/util_user.lua

@@ -128,22 +128,6 @@ function root:user_dispatch_game(uid)
     end
     return {nodeName = node.nodename, agent = gameAgent}
 end
-function root:user_dispatch_match_node(uid, conf)
-    local ok, matchNode = nodeMgr.call("battlemaster", ".srvNodeMgr", "dispatch_match_node", uid, conf)
-    if not ok or is_empty(matchNode) then
-        return
-    end
-
-    local ok, matchAgent = nodeMgr.call(matchNode, ".BattleMatch", "dispatch_match_agent", conf.battleType)
-    if not ok then
-        return
-    end
-    local nodeInfo = {}
-    nodeInfo.nodeName = matchNode
-    nodeInfo.agent = matchAgent
-    return nodeInfo
-end
 
 local MODULE_SESSION = "session"
 -- 玩家节点信息
@@ -208,33 +192,4 @@ function root:master_user_logout(uid, ...)
     return nodeMgr.call("master", ".srvNodeMgr", "userLogout", clusterName, nodename, uid, ...)
 end
 
-----------------------------------------
-----------------------------------------
-function root:user_call_2_battle(uid, cmd, ...)
-    if uid == nil or cmd == nil then
-        return code.PARAMTER_ERROR
-    end
-    local nodeInfo = self:user_get_cluster_info(uid, "battle")
-    if not nodeMgr.is_node_info_valid(nodeInfo) or nodeInfo.battleId == nil then
-        return code.BATTLE.NOT_EXIST
-    end
-    local ok, ret = nodeMgr.call_with_node_info(nodeInfo, "forward", nodeInfo.battleId, cmd, ...)
-    if not ok or ret == nil then
-        return code.BATTLE.NOT_EXIST
-    end
-    return ret.code, ret
-end
-
-function root:user_send_2_battle(uid, cmd, ...)
-    if uid == nil or cmd == nil then
-        return code.PARAMTER_ERROR
-    end
-    local nodeInfo = self:user_get_cluster_info(uid, "battle")
-    if not nodeMgr.is_node_info_valid(nodeInfo) or nodeInfo.battleId == nil then
-        return code.BATTLE.NOT_EXIST
-    end
-    nodeMgr.send_with_node_info(nodeInfo, "forward", nodeInfo.battleId, cmd, ...)
-end
-
 return root

nodes/battle/lib/battle.lua

@@ -1,378 +0,0 @@
-local skynet = require "skynet"
-local battleCore = require "battle.battleCore"
-local battleLog = require "battle.battleLog"
-local battleCode = require "battle.battleCode"
-local battleDefine = require "battle.battleDefine"
-local nodeMgr = require "nodeMgr"
-local httpc = require "http.httpc"
-local md5 = require "md5"
-local machine = require "machine"
-local code = require "code"
-local util_user = require "utils.util_user"
-local gameConst = require("const.gameConst")
-local battleAdapt = require "adapt.battleAdapt"
-
-local sessionData = require("data.session")
-local battleData = require("data.battle")
-
-local nodename = skynet.getenv("nodeName")
-
-local root = class("Battle")
-
-function root:ctor(matchInfo, battleParams, settleNodeInfo)
-    self.matchNodeInfo = {}
-    self.matchNodeInfo.nodeName = matchInfo.matchNode
-    self.matchNodeInfo.agent = matchInfo.matchAgent
-
-    self.roomId = matchInfo.roomId
-    self.matchId = matchInfo.matchId
-    self.battleId = matchInfo.battleId
-    self.isMatchSettle = matchInfo.isMatchSettle -- 结算经过业务服
-
-    self.settleNodeInfo = settleNodeInfo -- 结算节点
-
-    self.battleParams = battleParams
-    local w = battleParams.w
-    local h = battleParams.h
-    local debugJsonObj = battleParams.debugJsonObj
-    self.core = battleCore.new(self, matchInfo.battleReal, matchInfo.battleType, w, h, debugJsonObj)
-
-    self.record = {}
-    self.isActive = true
-end
-
-function root:get_core_id()
-    return string.format("%s:%s:%s", self.matchNodeInfo.nodeName, self.matchId, self.battleId)
-end
-
-function root:enableRecord()
-    return true
-end
-
-function root:addRecord(protoName, msg)
-    if self:enableRecord() then
-        table.insert(self.record, {proto = protoName, data = msg})
-    end
-end
-
-local protos = {
-    "on_battle_qipan_info",
-    "on_battle_operate_info",
-    "on_battle_start",
-    "on_battle_finish",
-    "on_battle_attack",
-    "on_battle_attack_finish",
-    "on_battle_create_info"
-}
-
-function root:notifyPlayer(uid, protoName, msg)
-    if uid == nil or is_robot(uid) or is_empty(protoName) then
-        return
-    end
-
-    local uidList = self.core:get_real_uid_list()
-    if uidList[1] == uid and table.include(protos, protoName) then
-        self:addRecord(protoName, msg)
-    end
-
-    util_user:user_proto_notify(uid, protoName, msg)
-end
-
-function root:game_player_settle(uid, msg)
-    -- 机器人
-    if uid == nil or is_robot(uid) then
-        return
-    end
-    -- 玩家不在线
-    local nodeInfo = util_user:user_get_cluster_info(uid, "game")
-    if not nodeMgr.is_node_info_valid(nodeInfo) then
-        nodeMgr.send("game1_1", ".settleSrv", "offline_settle", uid, msg)
-        return
-    end
-    util_user:user_send_game_agent(uid, "battle.settleBattle", msg)
-end
-
-function root:notifyClientLog(uid, logStr)
-    if uid == nil or is_robot(uid) or is_empty(logStr) then
-        return
-    end
-    battleLog:logClient(logStr)
-
-    -- TODO: Debug 测试代码,上线前修改过来.
-    util_user:user_notify_client_log(uid, logStr)
-end
-
-function root:recordOpenLog(...)
-    local logUtil = require "utils.serverLogUtil"
-    logUtil.logOpen(...)
-end
-
-function root:logEvent(...)
-    util_user:log_event(...)
-end
-
-function root:getBattleNode()
-    return nodename
-end
-
-function root:getBattleId()
-    return self.battleId
-end
-
-function root:getBattleParams()
-    return self.battleParams
-end
-
-local GAME_SALT_MD5 = "0bdb9a5863c8c9063a42f38a9d5166fe" -- 游戏服加盐 md5
-
-local function sendRecord(battleNode, battleStartTime, battleId, version, record)
-    local server = machine.get("record_server")
-    if is_nil(server) then
-        return
-    end
-    local url = "/record/add?sign="
-    local head = {["Content-Type"] = "application/json"}
-    local body =
-        cjson_encode(
-        {
-            node = tostring(battleNode),
-            startTime = tonumber(battleStartTime),
-            id = tonumber(battleId),
-            version = tostring(version),
-            record = cjson_encode(record)
-        }
-    )
-    url = url .. md5.sumhexa(body .. GAME_SALT_MD5)
-    local ok, errCode, response = pcall(httpc.request, "POST", server, url, nil, head, body)
-    if not ok then
-        battleLog:logError(
-            string.format(
-                "添加录像失败 battleNode=%s battleStartTime=%s battleId=%s version=%s",
-                battleNode,
-                battleStartTime,
-                battleId,
-                version
-            )
-        )
-    end
-    if errCode ~= 200 then
-        battleLog:logError(
-            string.format(
-                "添加录像失败 battleNode=%s battleStartTime=%s battleId=%s version=%s response=%s",
-                battleNode,
-                battleStartTime,
-                battleId,
-                version,
-                tostring(response and cjson_decode(response))
-            )
-        )
-    end
-end
-
-function root:startBattle(playerList, viewerList)
-    local battleInfo = {
-        matchId = self.matchId,
-        battleId = self.battleId,
-        nodeName = nodename,
-        agent = skynet.self()
-    }
-    for _, v in ipairs(playerList) do
-        if not is_robot(v.uid) then
-            sessionData:user_update_cluster_info(v.uid, "battle", battleInfo)
-        end
-    end
-    self.core:startBattle(playerList, viewerList)
-end
-
-function root:settleBattle(result)
-    -- 测试战斗类型
-    if battleAdapt:isAiTestBattle(self.core.battleType) then
-        log.warning(
-            "settleBattle battleId[%s] settleNodeInfo[%s]",
-            tostring(self.battleId),
-            tostring(self.settleNodeInfo)
-        )
-        if nodeMgr.is_node_info_valid(self.settleNodeInfo) then
-            nodeMgr.send_with_node_info(self.settleNodeInfo, "settle", result)
-        else
-            nodeMgr.send("test", ".aiSrv", "settle", result)
-        end
-        return
-    end
-    -- 组队
-    -- 业务服结算
-    if self.isMatchSettle then
-        nodeMgr.send_with_node_info(self.matchNodeInfo, "match_settle", self.roomId, result)
-        return
-    end
-
-    for _, v in ipairs(self.core:getAllPlayer()) do
-        self:game_player_settle(v.uid, result)
-    end
-end
-
-function root:dismissBattle(reason)
-    self.isActive = false
-    battleLog:logWarning(string.format("开始销毁对战服务并退出 battleId=%s reason=%s", self.battleId, reason))
-    nodeMgr.send_with_node_info(self.matchNodeInfo, "destory_battle", self.roomId)
-    local uidList = self.core:get_real_uid_list()
-    for _, v in ipairs(uidList) do
-        -- 清除玩家战斗节点信息
-        battleData:user_clear_battle_info(v)
-
-        self:notifyPlayer(v, "on_battle_finish", {code = battleCode.OK})
-    end
-    if self:enableRecord() then
-        sendRecord(self:getBattleNode(), self.core.battleStartTime, self:getBattleId(), 1.0, self.record)
-    end
-
-    skynet.call(".BattleMgr", "lua", "battleLeave", self.battleId, skynet.self())
-end
-
-function root:loginBattle(uid)
-    battleLog:logInfo(string.format("玩家%d登入对战", uid))
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        -- 围观进入
-        self.core:viewerLoginBattle(uid)
-        return
-    end
-    self.core:loginBattle(playerData)
-    -- self:playFinish(uid, self.core:getCurRound())
-end
-
-function root:logoutBattle(uid)
-    battleLog:logInfo(string.format("玩家%d登出对战", uid))
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        return
-    end
-    self.core:logoutBattle(playerData)
-    -- self.core:dismissBattle("force")
-end
-
-function root:is_user_in_battle(uid)
-    local playerData = self.core:getPlayer(uid)
-    if playerData then
-        return true
-    end
-    return false
-end
-
-function root:operate(uid, ids, exSkillGridId)
-    if not ids or #ids < battleDefine.MIN_LINK_BLOCK then
-        return {code = battleCode.BATTLE_COUNT_LESS}
-    end
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        return {code = battleCode.BATTLE_PLAYER_NOT_EXIST}
-    end
-    if self.core:getNextLinkUid() ~= uid then
-        return {code = battleCode.BATTLE_ROUND_ERR}
-    end
-    if self.core:isPlayerOperated(playerData) then
-        return {code = battleCode.BATTLE_OPERATED}
-    end
-    if not self.core:operate(playerData, ids, exSkillGridId) then
-        if IS_TEST then
-            self.core:sendTestGrids(playerData)
-        end
-        return {code = battleCode.BATTLE_CANNOT_LINK}
-    end
-    return {code = battleCode.OK}
-end
-
-function root:playFinish(uid, round)
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        return {code = battleCode.BATTLE_PLAYER_NOT_EXIST}
-    end
-    if self.core:getCurRound() ~= round then
-        return {code = battleCode.BATTLE_ROUND_EXPIRED}
-    end
-    self.core:playFinish(playerData, uid, round)
-    return {code = battleCode.OK}
-end
-function root:auto_link(uid, isAuto)
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        return {code = battleCode.BATTLE_PLAYER_NOT_EXIST}
-    end
-
-    self.core:updateAutoLink(playerData, isAuto)
-
-    return {code = code.OK}
-end
-
-function root:info(uid)
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        return {code = battleCode.BATTLE_PLAYER_NOT_EXIST}
-    end
-    self.core:info(playerData)
-    return {code = battleCode.OK}
-end
-
-function root:debug(uid, debugType, debugArgs)
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        return {code = battleCode.BATTLE_PLAYER_NOT_EXIST}
-    end
-    local errorMsg
-    if IS_TEST then
-        errorMsg = self.core:debug(playerData, debugType, debugArgs)
-    end
-    return {code = battleCode.OK, errorMsg = errorMsg}
-end
-
-function root:chat(uid, id, text)
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        return {code = battleCode.BATTLE_PLAYER_NOT_EXIST}
-    end
-    self.core:chat(playerData, id, text)
-    return {code = battleCode.OK}
-end
-
-function root:getOverview(uid)
-    local playerData = self.core:getPlayer(uid)
-    if not playerData then
-        return {code = battleCode.BATTLE_PLAYER_NOT_EXIST}
-    end
-    local msg = self.core:getOverview(playerData)
-    msg.code = battleCode.OK
-    return msg
-end
-
-function root:addViewers(uid)
-    self.core:addViewers(uid)
-end
-
-function root:deleteViewers(uid)
-    self.core:deleteViewers(uid)
-end
-
-function root:ping(uid)
-    local playerData = self.core:getPlayer(uid)
-    return playerData and true or false
-end
-
-function root:fastSettle(uid)
-    log.info("battle fastSettle uid = %s", tostring(uid))
-    self.core:settleBattle(2, nil, uid)
-end
-
-function root:isServerBattleAiOpen()
-    return true
-end
-
-return root

nodes/battle/lib/battleAiAssistSkillEvaluate.lua

@@ -1,735 +0,0 @@
---[[
- * File name: battleAiAssistSkillEvaluate.lua
- * Version:
- * Author: sky
- * Date time: 2023-06-27 10:29:27
- * Copyright (C) 2023.
- * Description: 辅助技能AI评分
---]]
-local battleAdapt = require "adapt.battleAdapt"
-local battleLog = require "battle.battleLog"
-local battleConst = require "battle.battleConst"
-
-----------------------------------------
-local _StAiAssistSkillMatching = {}
-local AiAssistSkillMatching =
-    setmetatable(
-    _StAiAssistSkillMatching,
-    {
-        __index = function(self, key)
-            -- print(tostring(self))
-            local funcName = string.format("getAiAssiSkillEvaluate%s", key)
-
-            local func = self.funcs[funcName]
-            if func then
-                return func
-            else
-                return self.funcs.getAiAssiSkillEvaluateCommon
-            end
-        end
-    }
-)
-
-------------------------------------------------------------
-local funcs = {}
-_StAiAssistSkillMatching.funcs = funcs
-
-------------------------------------------------------------
-
-local root = {}
-
-function root:getAiAssistSkillConfig(core, skillInfo)
-    local skillConfig = battleAdapt:getSkillByID(skillInfo.skillId or 0)
-    if skillConfig and skillConfig and #skillConfig.effectGroup > 0 then
-        for _, effectId in ipairs(skillConfig.effectGroup) do
-            local assistSkillConfig = battleAdapt:getAssistByEffectID(effectId)
-            if assistSkillConfig and (assistSkillConfig.params1 and not assistSkillConfig.params1.buffId) then
-                return assistSkillConfig
-            end
-        end
-    end
-end
-
-function root:getAiAssistSkillEvaluate(core, actionCastle, skillInfo, params)
-    local assistSkillLevel = skillInfo.newHeroAssistSkillLevel
-    if not assistSkillLevel or assistSkillLevel <= 0 then
-        return 0
-    end
-
-    local assistSkillConfig = self:getAiAssistSkillConfig(core, skillInfo)
-    if not assistSkillConfig then
-        return 0
-    end
-
-    return AiAssistSkillMatching[(skillInfo or {}).skillId or 0](
-        _StAiAssistSkillMatching.funcs,
-        core,
-        skillInfo,
-        params,
-        assistSkillConfig
-    )
-end
-
-------------------------------------------------------------
-
-function funcs:getAiAssiSkillEvaluateCommon(core, skillInfo, params, assistSkillConfig)
-    local newHeroAttack = params.newHeroAttack
-    return newHeroAttack * 0.65
-end
-
-function funcs:getAiAssiSkillEvaluate2221(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damageNums=0.25}},
-    local enemyHeroCount = params.enemyHeroCount -- 敌方英雄个数;
-    if enemyHeroCount > 0 then
-        local skillBase = skillInfo.skillBase
-        return math.floor(assistSkillConfig[parValue].ex.damageNums * skillBase * 0.75)
-    end
-    return 0
-end
-
-function funcs:getAiAssiSkillEvaluate1221(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={upNums=0.25}},
-    local enemyHeroCount = params.enemyHeroCount -- 敌方英雄个数;
-
-    if enemyHeroCount > 0 then
-        local skillBase = skillInfo.skillBase
-        return math.floor(assistSkillConfig[parValue].ex.upNums * skillBase * 0.75)
-    end
-    return 0
-end
-
-function funcs:getAiAssiSkillEvaluate4221(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {defendPercent=10},
-
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    return math.floor(assistSkillConfig[parValue].defendPercent * selfHeroTotalEv * 0.25 * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate3221(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {defendPercent=55},
-
-    local newHeroAttack = params.newHeroAttack
-    return math.floor(assistSkillConfig[parValue].defendPercent * newHeroAttack * 0.05)
-end
-
-function funcs:getAiAssiSkillEvaluate2231(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damageNums=0.25}},
-
-    local enemyHeroCount = params.enemyHeroCount
-    if enemyHeroCount > 0 then
-        local skillBase = skillInfo.skillBase
-        return math.floor(assistSkillConfig[parValue].ex.damageNums * skillBase * 0.75)
-    end
-    return 0
-end
-
-function funcs:getAiAssiSkillEvaluate1231(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {upNums=1.25},
-
-    local skillBase = skillInfo.skillBase
-    return math.floor(assistSkillConfig[parValue].upNums * skillBase * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate4231(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {upNums=1.25},
-
-    local skillBase = skillInfo.skillBase
-    return math.floor(assistSkillConfig[parValue].upNums * skillBase * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate3231(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent=20}},
-
-    -- 最弱的敌人
-    local enemyHeroList = params.enemyHeroList
-    local selfHeroLowestEv = 0
-    if #enemyHeroList > 0 and enemyHeroList[1] then
-        selfHeroLowestEv = self:getHeroEvaluate(core, enemyHeroList[1]) or 0
-    end
-
-    return math.floor(assistSkillConfig[parValue].ex.damagePercent * selfHeroLowestEv * 0.01 * 0.75)
-end
-
-function funcs:getAiAssiSkillEvaluate2241(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {damageNums=1},
-
-    local skillBase = skillInfo.skillBase
-    return math.floor(assistSkillConfig[parValue].damageNums * 3 * skillBase * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate1241(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent=63}},
-    local enemyHeroCount = params.enemyHeroCount
-    if enemyHeroCount == 1 then
-        local enemyHeroTotalEv = params.enemyHeroTotalEv
-        return math.floor(assistSkillConfig[parValue].ex.damagePercent * 0.01 * enemyHeroTotalEv * 0.5)
-    end
-    return 0
-end
-
-function funcs:getAiAssiSkillEvaluate4241(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {heroLiveNums=1.2},
-
-    local skillBase = skillInfo.skillBase
-    return math.floor(assistSkillConfig[parValue].heroLiveNums * skillBase * 3 * 0.2)
-end
-
-function funcs:getAiAssiSkillEvaluate3241(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {damageNums=0.1},
-
-    local skillBase = skillInfo.skillBase
-    return math.floor(assistSkillConfig[parValue].damageNums * 13 * skillBase * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate2251(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {damagePercent=55},
-    local newHeroAttack = params.newHeroAttack
-
-    return math.floor(
-        (assistSkillConfig[parValue].damagePercent * newHeroAttack * 0.75) +
-            (assistSkillConfig[parValue].damagePercent * newHeroAttack * 0.75)
-    )
-end
-
-function funcs:getAiAssiSkillEvaluate1251(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent=50,upX=1.5}},
-    local enemyHeroTotalEv = params.enemyHeroTotalEv
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    return math.floor(
-        max(enemyHeroTotalEv - selfHeroTotalEv, 0) * (assistSkillConfig[parValue].ex.upX * 0.5 - 0.5) * 0.5
-    )
-end
-
-function funcs:getAiAssiSkillEvaluate4251(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {damageNums = 1},
-
-    local skillBase = skillInfo.skillBase
-    return math.floor(assistSkillConfig[parValue].damageNums * skillBase * 0.75)
-end
-
-function funcs:getAiAssiSkillEvaluate3251(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {percent=20},
-    local enemyHeroTotalEv = params.enemyHeroTotalEv
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    local enemyAverageBaseAttack = params.enemyAverageBaseAttack
-
-    local ve = (max(enemyHeroTotalEv - selfHeroTotalEv, 0) + 5 * enemyAverageBaseAttack) - selfHeroTotalEv
-
-    if ve > 0 then
-        return math.floor(assistSkillConfig[parValue].percent * 0.01 * ve * 0.5)
-    end
-
-    return 0
-end
-
-function funcs:getAiAssiSkillEvaluate2261(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent=40}},
-    local enemyHeroTotalEv = params.enemyHeroTotalEv
-    return math.floor((50 - assistSkillConfig[parValue].ex.damagePercent) * enemyHeroTotalEv * 0.01)
-end
-
-function funcs:getAiAssiSkillEvaluate1261(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {heroLiveNums=1.5},
-
-    local skillBase = skillInfo.skillBase
-    return math.floor(assistSkillConfig[parValue].heroLiveNums * skillBase * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate4261(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {defendPercent=55},
-    local enemyAverageBaseAttack = params.enemyAverageBaseAttack
-
-    return math.floor(5 * assistSkillConfig[parValue].defendPercent * 0.01 * enemyAverageBaseAttack * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate3261(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent=20}},
-    local baseAttack = params.baseAttack
-
-    return math.floor(assistSkillConfig[parValue].ex.damagePercent * 0.01 * baseAttack * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate2351(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {num=1},
-    local baseAttack = params.baseAttack
-    local skillBase = skillInfo.skillBase
-    return math.floor(assistSkillConfig[parValue].num * baseAttack * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate1351(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {defendPercent=-12.5},
-    -- params1 = {ex={damagePercent=112.5}},
-    local paramsValue = 0
-    if assistSkillConfig[parValue].ex then
-        paramsValue = assistSkillConfig[parValue].ex.damagePercent
-    else
-        paramsValue = assistSkillConfig[parValue].defendPercent
-    end
-
-    local newHeroAttack = params.newHeroAttack
-    return math.floor(paramsValue * newHeroAttack * 0.75)
-end
-
-function funcs:getAiAssiSkillEvaluate4351(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent=20,upX=1.1}},
-    -- 最弱的敌人
-    local enemyHeroList = params.enemyHeroList
-    local enemyHeroLowestEv = 0
-    if #enemyHeroList > 0 and enemyHeroList[1] then
-        enemyHeroLowestEv = self:getHeroEvaluate(core, enemyHeroList[1]) or 0
-    end
-
-    -- 最弱的自己人
-    local selfHeroList = params.selfHeroList
-    local selfHeroLowestEv = 0
-    if #selfHeroList > 0 and selfHeroList[1] then
-        selfHeroLowestEv = self:getHeroEvaluate(core, selfHeroList[1]) or 0
-    end
-    local newHeroAttack = params.newHeroAttack
-    if selfHeroLowestEv == newHeroAttack then
-        if #selfHeroList > 1 and selfHeroList[2] then
-            selfHeroLowestEv = self:getHeroEvaluate(core, selfHeroList[2]) or 0
-        end
-    end
-
-    local minHero = min(enemyHeroLowestEv, selfHeroLowestEv)
-
-    return math.floor(
-        (assistSkillConfig[parValue].ex.upX * assistSkillConfig[parValue].ex.damagePercent -
-            assistSkillConfig[parValue].ex.damagePercent) *
-            minHero *
-            1
-    )
-end
-
-function funcs:getAiAssiSkillEvaluate3351(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={upPercent=20}},
-
-    local newHeroAttack = params.newHeroAttack
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    local ev = max(selfHeroTotalEv - newHeroAttack, 0)
-    return math.floor(assistSkillConfig[parValue].ex.upPercent * 0.01 * ev * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate2361(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=20}},
-    local selfHeroList = params.selfHeroList
-    local selfHeroLowestEv = 0
-    if #selfHeroList > 0 and selfHeroList[1] then
-        selfHeroLowestEv = self:getHeroEvaluate(core, selfHeroList[1]) or 0
-    end
-
-    return math.floor(assistSkillConfig[parValue].ex.percent * 0, 01 * selfHeroLowestEv * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate1361(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {upNums=0.1},
-    local baseAttack = params.baseAttack
-    return math.floor(10 * assistSkillConfig[parValue].upNums * baseAttack * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate4361(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {num=2},
-    local newHeroAttack = params.newHeroAttack
-    return math.floor(assistSkillConfig[parValue].ex.damageNums * 0.1 * newHeroAttack * 0.75)
-end
-
-function funcs:getAiAssiSkillEvaluate3361(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {heroLiveNums=1.4},
-    local averageBaseAttack = params.averageBaseAttack
-    local averageBaseAttack = skillInfo.skillBase
-    return math.floor(3 * assistSkillConfig[parValue].heroLiveNums * averageBaseAttack * 0.65)
-end
-
-function funcs:getAiAssiSkillEvaluate2281(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {upNums=0.5},
-    local enemyHeroCount = params.enemyHeroCount
-    local baseAttack = params.baseAttack
-    return math.floor(enemyHeroCount * assistSkillConfig[parValue].upNums * baseAttack * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate1281(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {num=1},
-    local baseAttack = params.baseAttack
-    return math.floor(assistSkillConfig[parValue].num * baseAttack * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate4281(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {upNums=0.5},
-    local enemyHeroCount = params.enemyHeroCount
-    local baseAttack = params.baseAttack
-
-    return math.floor(enemyHeroCount * assistSkillConfig[parValue].upNums * baseAttack * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate3281(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={upPercent=10}},
-    local averageBaseAttack = params.averageBaseAttack
-    return math.floor(assistSkillConfig[parValue].ex.upPercent * averageBaseAttack * 0.01)
-end
-
-function funcs:getAiAssiSkillEvaluate2291(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=90}},
-    local newHeroAttack = params.newHeroAttack
-    return math.floor(assistSkillConfig[parValue].ex.damageNums * 0.01 * newHeroAttack * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate1291(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {upPercent=30},
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    return math.floor((assistSkillConfig[parValue].upPercent - 25) * 0.01 * selfHeroTotalEv * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate4291(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={upNums=1}},
-    local selfHeroList = params.selfHeroList
-    local newBlockXYMap = params.newBlockXYMap
-    local baseAttack = params.baseAttack
-
-    local count = 0
-    for _, hero in ipairs(selfHeroList) do
-        if newBlockXYMap[hero.bindBlock.id].y > 0 then
-            count = count + 1
-        end
-    end
-
-    return math.floor(assistSkillConfig[parValue].ex.upNums * count * baseAttack)
-end
-
-function funcs:getAiAssiSkillEvaluate3291(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {assistSkillLevel=1},
-    local baseAttack = params.baseAttack
-    return math.floor(assistSkillConfig[parValue].assistSkillLevel * baseAttack)
-end
-
-function funcs:getAiAssiSkillEvaluate2311(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {upNums=0.5},
-    local baseAttack = params.baseAttack
-    return math.floor(assistSkillConfig[parValue].upNums * baseAttack)
-end
-
-function funcs:getAiAssiSkillEvaluate1311(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=10}},
-    local newHeroAttack = params.newHeroAttack
-    return math.floor(assistSkillConfig[parValue].ex.percent * 0.01 * newHeroAttack * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate4311(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {damagePercent=110},
-
-    local skillBase = skillInfo.skillBase
-    return math.floor(4 * (assistSkillConfig[parValue].damagePercent - 100) * 0.01 * skillBase * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate3311(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {defendPercent=-50},
-    local enemyHeroTotalEv = params.enemyHeroTotalEv
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    local defendPercent = math.abs(assistSkillConfig[parValue].defendPercent)
-
-    if enemyHeroTotalEv > (1.5 * selfHeroTotalEv) then
-        return math.floor(defendPercent * 0.01 * selfHeroTotalEv * 0.75)
-    else
-        return math.floor(defendPercent * 0.01 * enemyHeroTotalEv * 0.75)
-    end
-end
-
-function funcs:getAiAssiSkillEvaluate2321(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent={30, 30, 30, 30}}},
-    local defendPercent = (assistSkillConfig[parValue].ex.damagePercent or {})[1] or 0
-
-    local newHeroAttack = params.newHeroAttack
-    return math.floor((defendPercent - 25) * newHeroAttack * 0.75)
-end
-
-function funcs:getAiAssiSkillEvaluate1321(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {upNums=1},
-    local defendPercent = assistSkillConfig[parValue].upNums
-
-    local baseAttack = params.baseAttack
-    return math.floor(defendPercent * baseAttack * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate4321(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {defendPercent=10},
-    local defendPercent = assistSkillConfig[parValue].defendPercent
-    local baseAttack = params.baseAttack
-
-    return math.floor(defendPercent * baseAttack * 0.1)
-end
-
-function funcs:getAiAssiSkillEvaluate3321(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent=60}},
-    local damagePercent = assistSkillConfig[parValue].ex.damagePercent
-    local newHeroAttack = params.newHeroAttack
-
-    return math.floor((damagePercent - 50) * newHeroAttack * 0.75)
-end
-
-function funcs:getAiAssiSkillEvaluate2331(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=60}},
-    local percent = assistSkillConfig[parValue].ex.percent
-
-    -- 最弱的自己人
-    local selfHeroList = params.selfHeroList
-    local selfHeroLowestEv = 0
-    if #selfHeroList > 0 and selfHeroList[1] then
-        selfHeroLowestEv = self:getHeroEvaluate(core, selfHeroList[1]) or 0
-    end
-
-    return math.floor(percent * selfHeroLowestEv * 0.01)
-end
-
-function funcs:getAiAssiSkillEvaluate1331(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={upNums=1}},
-    local upNums = assistSkillConfig[parValue].ex.upNums
-
-    local enemyHeroCount = params.enemyHeroCount
-    local baseAttack = params.baseAttack
-
-    return math.floor(upNums * baseAttack * 1)
-end
-
-function funcs:getAiAssiSkillEvaluate4331(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=10}},
-    local percent = assistSkillConfig[parValue].ex.percent
-
-    local enemyHeroTotalEv = params.enemyHeroTotalEv
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    local enemyAverageBaseAttack = params.enemyAverageBaseAttack
-
-    local ev = (max((enemyHeroTotalEv - selfHeroTotalEv), 0) + 5 * enemyAverageBaseAttack) * 0.5 * percent * 0.5 * 0.01
-    return math.floor(ev)
-end
-
-function funcs:getAiAssiSkillEvaluate3331(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=50}},
-    local percent = assistSkillConfig[parValue].ex.percent
-    -- TODO: Debug 测试代码,上线前修改过来.
-
-    local selfHeroCount = params.selfHeroCount
-    local averageBaseAttack = params.averageBaseAttack
-
-    return math.floor(percent * selfHeroCount * averageBaseAttack * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate2341(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=10}},
-    local percent = assistSkillConfig[parValue].ex.percent
-
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    return math.floor(percent * 0.01 * selfHeroTotalEv * 0.5 * 0.65)
-end
-
-function funcs:getAiAssiSkillEvaluate1341(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=10}},
-    local percent = assistSkillConfig[parValue].ex.percent
-
-    local selfHeroTotalEv = params.selfHeroTotalEv
-    return math.floor(percent * 0.01 * selfHeroTotalEv * 0.5 * 0.65)
-end
-
-function funcs:getAiAssiSkillEvaluate4341(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={percent=50}},
-    local percent = assistSkillConfig[parValue].ex.percent
-
-    local baseAttack = params.baseAttack
-
-    return math.floor(3 * percent * 0.01 * baseAttack * 0.5)
-end
-
-function funcs:getAiAssiSkillEvaluate3341(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    -- params1 = {ex={damagePercent=55}},
-    local damagePercent = assistSkillConfig[parValue].ex.damagePercent
-
-    local enemyHeroCount = params.enemyHeroCount
-    local baseAttack = params.baseAttack
-
-    return math.floor((damagePercent - 50) * enemyHeroCount * baseAttack * 0.75)
-end
-
-function funcs:getAiAssiSkillEvaluate1002(core, skillInfo, params, assistSkillConfig)
-    local parValue = string.format("params%s", skillInfo.newHeroAssistSkillLevel)
-    --
-    local damagePercent = assistSkillConfig[parValue].ex.damagePercent
-    local enemyHeroCount = params.enemyHeroCount
-    local skillBase = skillInfo.skillBase
-    return math.floor(damagePercent * skillBase * 0.75)
-end
-
-function funcs:getHeroEvaluate(core, hero)
-    -- local buffs = hero:getBuffByType(battleConst.BUFF_TYPE.VALUE_SHIELD)
-    -- local shield = 0
-    -- for _, buff in ipairs(buffs) do
-    --     shield = shield + (buff.hp or 0)
-    -- end
-    -- return hero:getHp() + shield * 0.5
-    return hero:getHp()
-end
-
-return root

nodes/battle/lib/battleAiLogic.lua

@@ -1,611 +0,0 @@
-local skynet = require "skynet"
-local battleConst = require "battle.battleConst"
-local battleLog = require "battle.battleLog"
-local battleUtils = require "battle.battleUtils"
-local battleAdapt = require "adapt.battleAdapt"
-local battleDefine = require "battle.battleDefine"
-local battleAiUtils = require "battleAiUtils"
-local utils_bt_supply = require "utils_bt_supply"
-
-local root = {}
-
-local Total_Weight = {2, 8, 11, 9, 7, 3}
-local Grid_Color_Weights = {
-    {num = 7, colors = {{p1 = 4, p2 = 3}, {p1 = 3, p2 = 4}}},
-    {num = 8, colors = {{p1 = 4, p2 = 4}}},
-    {num = 9, colors = {{p1 = 5, p2 = 4}, {p1 = 4, p2 = 5}}},
-    {num = 10, colors = {{p1 = 5, p2 = 5}}},
-    {num = 11, colors = {{p1 = 5, p2 = 6}, {p1 = 6, p2 = 5}, {p1 = 7, p2 = 4}, {p1 = 4, p2 = 7}}},
-    {num = 12, colors = {{p1 = 6, p2 = 6}, {p1 = 7, p2 = 5}, {p1 = 5, p2 = 7}}},
-    {num = 13, colors = {{p1 = 7, p2 = 6}, {p1 = 6, p2 = 7}, {p1 = 8, p2 = 5}, {p1 = 5, p2 = 8}}},
-    {num = 14, colors = {{p1 = 7, p2 = 7}, {p1 = 8, p2 = 6}, {p1 = 6, p2 = 8}}},
-    {num = 15, colors = {{p1 = 8, p2 = 7}, {p1 = 7, p2 = 8}, {p1 = 9, p2 = 6}, {p1 = 6, p2 = 9}}},
-    {num = 16, colors = {{p1 = 8, p2 = 8}, {p1 = 9, p2 = 7}, {p1 = 7, p2 = 9}}},
-    {num = 17, colors = {{p1 = 9, p2 = 8}}},
-    {num = 18, colors = {{p1 = 9, p2 = 9}}},
-    {num = 19, colors = {{p1 = 10, p2 = 9}}},
-    {num = 20, colors = {{p1 = 10, p2 = 10}}}
-}
------------------------------------------------
-------------------色块生成逻辑------------------
---[[ 生成50个色块
-]]
-function root:initGrid(core)
-    self:printToConsole("-->initGrid...")
-
-    local needColorData1, needColorData2 = self:getGridTotalColorNum(core)
-
-    local grids1 = self:createGridColor(core, 0, needColorData1) or {}
-    local grids2 = self:createGridColor(core, 1, needColorData2) or {}
-
-    self:printToConsole(string.format("结果1：%s", table.concat(grids1, ", ")))
-    self:printToConsole(string.format("结果2：%s", table.concat(grids2, ", ")))
-    return self:tableConcat(grids1, grids2)
-    -- {3, 2, 3, 2, 4, 1, 4, 3, 2, 4, 2, 1, 4, 1, 1, 2, 3, 2, 3, 2, 3, 3, 2, 3, 3, 3, 2, 3, 2, 4, 1, 4, 3, 2, 4, 2, 1, 4, 1, 1, 2, 3, 2, 3, 2, 3, 3, 2, 3, 3}
-end
-
-function root:getGridTotalColorNum(core)
-    local totalWeight = Total_Weight
-    local totalStartIndex = 9
-    local gridColorWeights = Grid_Color_Weights
-
-    local totalRedIndex = self:randomWeightToIndex(totalWeight)
-    local totalRed = totalStartIndex + totalRedIndex
-
-    local totalGreenIndex = self:randomWeightToIndex(totalWeight)
-    local totalGreen = totalStartIndex + totalGreenIndex
-
-    local totalBlueIndex = self:randomWeightToIndex(totalWeight)
-    local totalBlue = totalStartIndex + totalBlueIndex
-
-    local total = core.areaW * core.areaH * 2
-    local totalYellow = total - totalRed - totalGreen - totalBlue
-    -- self:printToConsole( string.format("totalRed=%d, totalGreen=%d, totalBlue=%d, totalYellow=%d", totalRed, totalGreen, totalBlue, totalYellow) )
-
-    local needColorData1 = {red = 0, green = 0, blue = 0, yellow = 0}
-    local needColorData2 = {red = 0, green = 0, blue = 0, yellow = 0}
-    local colorNum = self:getGridColorNumByColor(gridColorWeights, totalRed)
-    needColorData1.red = colorNum.p1
-    needColorData2.red = colorNum.p2
-    colorNum = self:getGridColorNumByColor(gridColorWeights, totalGreen)
-    needColorData1.green = colorNum.p1
-    needColorData2.green = colorNum.p2
-    colorNum = self:getGridColorNumByColor(gridColorWeights, totalBlue)
-    needColorData1.blue = colorNum.p1
-    needColorData2.blue = colorNum.p2
-    colorNum = self:getGridColorNumByColor(gridColorWeights, totalYellow)
-    needColorData1.yellow = colorNum.p1
-    needColorData2.yellow = colorNum.p2
-
-    -- self:printToConsole( string.format("needColorData1=%d,%d,%d,%d", needColorData1.red, needColorData1.yellow, needColorData1.green, needColorData1.blue) );
-    -- self:printToConsole( string.format("needColorData2=%d,%d,%d,%d", needColorData2.red, needColorData2.yellow, needColorData2.green, needColorData2.blue) );
-
-    return needColorData1, needColorData2
-end
-
-function root:getGridColorNumByColor(gridColorWeights, totalNum)
-    for i, v in ipairs(gridColorWeights) do
-        if v.num == totalNum then
-            local randomIndex = math.random(1, #v.colors)
-            local colorObj = v.colors[randomIndex]
-            return colorObj
-        end
-    end
-    return {p1 = 0, p2 = 0}
-end
-
-function root:createGridColor(core, castleIndex, needColorData)
-    local gridColorList = {}
-    local printGridCount = {0, 0, 0, 0}
-    local colorWeights = {10, 10, 10, 10}
-    local isCanLink = false
-    local total = core.areaW * core.areaH
-    for i = 1, total do
-        colorWeights[1] = needColorData.red > 0 and 10 or 0
-        colorWeights[2] = needColorData.yellow > 0 and 10 or 0
-        colorWeights[3] = needColorData.green > 0 and 10 or 0
-        colorWeights[4] = needColorData.blue > 0 and 10 or 0
-
-        local tempColorWeights
-        if not isCanLink and i >= total - 2 then
-            colorWeights = {10, 0, 0, 0}
-            if i == total then
-                self:printToConsole("-------- 强制生成三块红色 --------")
-            end
-        else
-            tempColorWeights = self:checkNearGridColor(gridColorList, colorWeights)
-        end
-
-        if colorWeights[1] == 0 and colorWeights[2] == 0 and colorWeights[3] == 0 and colorWeights[4] == 0 then
-            -- self:printToConsole("重新初始化权重")
-            colorWeights = {10, 10, 10, 10}
-            if
-                tempColorWeights[1].w == 0 and tempColorWeights[2].w == 0 and tempColorWeights[3].w == 0 and
-                    tempColorWeights[4].w == 0
-             then
-                -- self:printToConsole('### 相邻色块都超过5 ###')
-            else
-                for j = 1, 4 do
-                    if tempColorWeights[j].w == 0 then
-                        colorWeights[j] = 0
-                    end
-                end
-            end
-        end
-
-        local colorType = self:randomWeightToIndex(colorWeights)
-        table.insert(gridColorList, colorType)
-        printGridCount[colorType] = printGridCount[colorType] + 1
-
-        if colorType == 1 then
-            needColorData.red = needColorData.red - 1
-        elseif colorType == 2 then
-            needColorData.yellow = needColorData.yellow - 1
-        elseif colorType == 3 then
-            needColorData.green = needColorData.green - 1
-        elseif colorType == 4 then
-            needColorData.blue = needColorData.blue - 1
-        end
-
-        if tempColorWeights and tempColorWeights[colorType].n >= 3 then
-            isCanLink = true
-        end
-    end
-
-    -- self:printToConsole( string.format("玩家%d：红-%d, 黄-%d,绿-%d, 蓝-%d", castleIndex, printGridCount[1], printGridCount[2], printGridCount[3], printGridCount[4]) )
-    return gridColorList
-end
-
-function root:checkNearGridColor(gridColorList, colorWeights)
-    local tempColorWeights = {{w = 10, n = 0}, {w = 10, n = 0}, {w = 10, n = 0}, {w = 10, n = 0}}
-    if #gridColorList < 4 then
-        return tempColorWeights
-    end
-    for i = 1, 4 do
-        local nearGridColorCount = self:getNearGridColorCount(gridColorList, i)
-        if nearGridColorCount > 5 then
-            colorWeights[i] = 0
-            tempColorWeights[i].w = 0
-        -- self:printToConsole( string.format("   %d 相邻色块超过5，把权重调0", #gridColorList) )
-        end
-        tempColorWeights[i].n = nearGridColorCount
-    end
-    return tempColorWeights
-end
-
-function root:getNearGridColorCount(gridColorList, color, index)
-    local gridIndex = index ~= nil and index or #gridColorList
-    local list = {gridIndex}
-    local index = 1
-    while index <= #list do
-        local checkIndex = list[index]
-        index = index + 1
-        local gridX = checkIndex % 5
-        local gridY = math.floor(checkIndex / 5)
-        for i = -1, 1 do
-            for j = -1, 1 do
-                if (i ~= 0 or j ~= 0) and (gridX + i) >= 0 and (gridY + j) >= 0 and (gridX + i < 5) and (gridY + j < 5) then
-                    local tempIndex = self:getGridIndexByXY(gridX + i, gridY + j)
-                    local tempColor = gridColorList[tempIndex + 1]
-                    if
-                        tempColor and self:checkIsSameColor(tempColor, color) and
-                            self:findGridIndex(list, tempIndex) <= 0
-                     then
-                        table.insert(list, tempIndex)
-                        if color == battleConst.COLOR_TYPE.ALL then
-                            color = tempColor
-                        end
-                    end
-                end
-            end
-        end
-    end
-    -- self:printToConsole( string.format("[%d] color=%d, data=%s, list=%s", gridIndex, color, table.concat(gridColorList, "," ), table.concat(list, "," )) )
-    return #list
-end
-
-function root:checkIsSameColor(tempColor, color)
-    return tempColor == battleConst.COLOR_TYPE.ALL or color == battleConst.COLOR_TYPE.ALL or tempColor == color
-end
-
-function root:findGridIndex(list, tempIndex)
-    for i, v in ipairs(list) do
-        if tempIndex == v then
-            return i
-        end
-    end
-    return 0
-end
-
-function root:getGridIndexByXY(gridX, gridY)
-    return gridY * 5 + gridX
-end
-
-local function log2Client(core, logStr)
-    if not logStr then
-        return
-    end
-    battleLog:logClient(logStr)
-
-    core:notifyClientLog(logStr)
-end
-
------------------------------------------------
-------------------色块补充逻辑------------------
-function root:supplyGrids(core, actionCastle)
-    local grids = core.map
-    local curRound = core:getCurRound()
-
-    -- 将需要补充的色块，重置颜色为0
-    for _, block in ipairs(grids) do
-        if block.status == battleConst.BLOCK_STATUS.NEEDUPDATE then
-            block.color = battleConst.COLOR_TYPE.INVAILD
-            block:clear()
-        end
-    end
-
-    local enemyCastle = core:getEnemyCastle(actionCastle)
-    local supplyRound = enemyCastle.supplyRound
-    local supplyWeight1 = enemyCastle.supplyWeight1
-    local supplyWeight2 = enemyCastle.supplyWeight2
-    local supplyWeight = curRound <= supplyRound and supplyWeight1 or supplyWeight2
-    local supplyType = getRandomWithWeight(supplyWeight)
-
-    supplyType = "A57"
-
-    local seat = actionCastle.seat
-    local is2v2 = core.is2v2
-    utils_bt_supply:supply_grids(core, seat, grids, supplyType, is2v2)
-end
-
-function root:randomWeightToIndex(list)
-    if list == nil or #list == 0 then
-        return 1
-    end
-    local sum = 0
-    for i, weight in ipairs(list) do
-        sum = sum + weight
-    end
-
-    if sum <= 0 then
-        return 1
-    end
-
-    local ret = 1
-    local r = math.random(1, sum)
-    local didSum = 0
-    for index, q in ipairs(list) do
-        didSum = didSum + q
-        if r <= didSum then
-            ret = index
-            break
-        end
-    end
-    return ret
-end
-
-local function getOptionLinks(core, actionCastle)
-    local allLinks = battleUtils:getAllLinkBlocks2(core, core.map, actionCastle.seat)
-    table.sort(
-        allLinks,
-        function(a, b)
-            return #a.linkIds > #b.linkIds
-        end
-    )
-    for i = #allLinks, 1, -1 do
-        for j = 1, i - 1 do
-            local member = true
-            for _, v in ipairs(allLinks[i].linkIds) do
-                if not table.member(allLinks[j].linkIds, v) then
-                    member = false
-                    break
-                end
-            end
-            if member then
-                table.remove(allLinks, i)
-                break
-            end
-        end
-    end
-    return allLinks
-end
-
-local link = class("link")
-
-function link:ctor()
-    self.ids = {}
-    self.size = 0
-    self.lastY = 0
-end
-
-local function createLink(core, actionCastle, linkIds, isFool)
-    local l = link.new()
-    l.ids = battleUtils:reverse(core.map, actionCastle.seat, linkIds, isFool)
-    l.size = #linkIds
-    local lastBlock = battleUtils:getColorBlockByID(core.map, l.ids[l.size])
-    l.lastY = lastBlock.y
-
-    return l
-end
-
-local function findGridSuppressRoute(core, actionCastle)
-    local nowTime = skynet.time()
-    local allLinks = getOptionLinks(core, actionCastle)
-    if table.empty(allLinks) then
-        battleLog:logInfo(string.format("findGridSuppressRoute empty links error, uid %s", actionCastle.uid))
-        return
-    end
-
-    local result = {}
-    local exceptLinks = {}
-    local enableExSkill = core:getEnableExSkill(actionCastle)
-    for _, v in ipairs(allLinks) do
-        local ret, exSkillGridId, except =
-            battleAiUtils:getLongEvaluate(core, actionCastle, v.linkIds, v.color, false, enableExSkill)
-        if ret >= 1000000 then
-            battleLog:logInfo(string.format("findGridSuppressRoute time cost %s", skynet.time() - nowTime))
-            return v.linkIds, exSkillGridId
-        end
-        if except then
-            table.link(
-                exceptLinks,
-                battleUtils:getLinkBlocksWithoutExceptBlocks(
-                    core,
-                    core.map,
-                    actionCastle.seat,
-                    except.blocks,
-                    except.exceptBlocks
-                )
-            )
-        end
-        table.insert(result, {ids = v.linkIds, size = #v.linkIds, allPower = ret, exSkillGridId = exSkillGridId})
-
-        local linkIds = table.reverse(v.linkIds)
-        ret, exSkillGridId = battleAiUtils:getLongEvaluate(core, actionCastle, linkIds, v.color, true, enableExSkill)
-        if ret >= 1000000 then
-            battleLog:logInfo(string.format("findGridSuppressRoute time cost %s", skynet.time() - nowTime))
-            return linkIds, exSkillGridId
-        end
-        table.insert(result, {ids = linkIds, size = #linkIds, allPower = ret, exSkillGridId = exSkillGridId})
-    end
-    for _, v in ipairs(exceptLinks) do
-        local ret, exSkillGridId =
-            battleAiUtils:getLongEvaluate(core, actionCastle, v.linkIds, v.color, true, enableExSkill)
-        if ret >= 1000000 then
-            battleLog:logInfo(string.format("findGridSuppressRoute time cost %s", skynet.time() - nowTime))
-            return v.linkIds, exSkillGridId
-        end
-        table.insert(result, {ids = v.linkIds, size = #v.linkIds, allPower = ret, exSkillGridId = exSkillGridId})
-
-        local linkIds = table.reverse(v.linkIds)
-        ret, exSkillGridId = battleAiUtils:getLongEvaluate(core, actionCastle, linkIds, v.color, true, enableExSkill)
-        if ret >= 1000000 then
-            battleLog:logInfo(string.format("findGridSuppressRoute time cost %s", skynet.time() - nowTime))
-            return linkIds, exSkillGridId
-        end
-        table.insert(result, {ids = linkIds, size = #linkIds, allPower = ret, exSkillGridId = exSkillGridId})
-    end
-
-    table.sort(
-        result,
-        function(a, b)
-            if a.allPower ~= b.allPower then
-                return a.allPower > b.allPower
-            end
-            return a.size > b.size
-        end
-    )
-
-    battleLog:logInfo(string.format("findGridSuppressRoute time cost %s", skynet.time() - nowTime))
-    return result[1].ids, result[1].exSkillGridId
-end
-
-local function findGridCommonRoute(core, actionCastle)
-    local nowTime = skynet.time()
-    local allLinks = getOptionLinks(core, actionCastle)
-    if table.empty(allLinks) then
-        battleLog:logInfo(string.format("findGridCommonRoute empty links error, uid %s", actionCastle.uid))
-        return
-    end
-
-    local result = {}
-    for _, v in ipairs(allLinks) do
-        table.insert(result, createLink(core, actionCastle, v.linkIds, false))
-    end
-
-    table.sort(
-        result,
-        function(a, b)
-            if a.size ~= b.size then
-                return a.size > b.size
-            end
-            if actionCastle.seat == battleConst.BATTLE_SEAT.DOWN then
-                return a.lastY < b.lastY
-            else
-                return a.lastY > b.lastY
-            end
-        end
-    )
-
-    local ids = result[1].ids
-    local exSkillGridId
-
-    local enableExSkill = core:getEnableExSkill(actionCastle)
-    if enableExSkill then
-        exSkillGridId = battleAiUtils:getNormatlExSkillGridId(core, actionCastle, ids)
-    end
-
-    battleLog:logInfo(string.format("findGridCommonRoute time cost %s", skynet.time() - nowTime))
-    return ids, exSkillGridId
-end
-
-local function findGridFoolRoute(core, actionCastle)
-    local nowTime = skynet.time()
-
-    -- 获取全部连线
-    local allLinks = getOptionLinks(core, actionCastle)
-    if table.empty(allLinks) then
-        battleLog:logInfo(string.format("findGridFoolRoute empty links error, uid %s", actionCastle.uid))
-        return
-    end
-
-    -- 愚蠢取落点低的规则：对手（真人）游戏局数小于5局，或者30%概率
-    local enemyCastle = core:getEnemyCastle(actionCastle)
-    local mainPlayer = enemyCastle:getMainPlayer()
-    local isFool = false
-    if mainPlayer.battleCount < 5 then
-        isFool = true
-    else
-        isFool = math.random(100) <= 30
-    end
-
-    -- 全部连线结构化
-    local result = {}
-    for _, v in ipairs(allLinks) do
-        table.insert(result, createLink(core, actionCastle, v.linkIds, isFool))
-    end
-
-    -- 连线排序：优先长度，其次落点
-    table.sort(
-        result,
-        function(a, b)
-            if a.size ~= b.size then
-                return a.size > b.size
-            end
-
-            if isFool then
-                if actionCastle.seat == battleConst.BATTLE_SEAT.UP then
-                    return a.lastY < b.lastY
-                else
-                    return a.lastY > b.lastY
-                end
-            else
-                if actionCastle.seat == battleConst.BATTLE_SEAT.UP then
-                    return a.lastY > b.lastY
-                else
-                    return a.lastY < b.lastY
-                end
-            end
-        end
-    )
-
-    -- 获取长度最长的连线
-    local linkIds = result[1].ids
-
-    -- 10%的概率漏连。漏连数量在 BattleCommonConfig 配置
-    if math.random(100) <= 10 then
-        local lessWeights = battleAdapt:getLessLinkWeights()
-        local lessCount = RandomWithWeight(lessWeights)
-        for i = 1, lessCount do
-            if #linkIds == battleDefine.MIN_LINK_BLOCK then
-                break
-            end
-            table.remove(linkIds, 1)
-        end
-    end
-
-    local ids = linkIds
-    local exSkillGridId
-
-    local enableExSkill = core:getEnableExSkill(actionCastle)
-    if enableExSkill then
-        exSkillGridId = battleAiUtils:getNormatlExSkillGridId(core, actionCastle, ids)
-    end
-
-    battleLog:logInfo(string.format("findGridFoolRoute time cost %s", skynet.time() - nowTime))
-    return ids, exSkillGridId
-end
-
-local function findGridStupidRoute(core, actionCastle)
-    local nowTime = skynet.time()
-
-    -- 获取全部连线
-    local allLinks = getOptionLinks(core, actionCastle)
-    if table.empty(allLinks) then
-        battleLog:logInfo(string.format("findGridStupidRoute empty links error, uid %s", actionCastle.uid))
-        return
-    end
-
-    local isFool = true
-
-    -- 全部连线结构化
-    local result = {}
-    for _, v in ipairs(allLinks) do
-        table.insert(result, createLink(core, actionCastle, v.linkIds, isFool))
-    end
-
-    local ids
-    local exSkillGridId = nil
-
-    -- 随机一条连线
-    local linkIds = result[math.random(#result)].ids
-    if #linkIds > 3 then
-        ids = {}
-        for i = 1, 3 do
-            table.insert(ids, linkIds[i])
-        end
-    else
-        ids = linkIds
-    end
-
-    battleLog:logInfo(string.format("findGridStupidRoute time cost %s", skynet.time() - nowTime))
-    return ids, exSkillGridId
-end
-
------------------------------------------------
-------------------色块寻路逻辑------------------
---[[寻找最长的路线
-]]
-function root:findGridLongRoute(core, actionCastle, aiLinkType)
-    if not aiLinkType then
-        log.error("findGridLongRoute aiLinkType is nil")
-        return
-    end
-
-    -- if aiLinkType == "W" and math.random(100) <= 20 then
-    --     aiLinkType = "R"
-    -- elseif aiLinkType == "R" and math.random(100) <= 20 then
-    --     aiLinkType = "W"
-    -- end
-
-    -- aiLinkType = "R"
-
-    log2Client(core, string.format("当前回合%s aiLinkType=%s", core:getCurRound(), aiLinkType))
-
-    if aiLinkType == "W" then
-        return findGridSuppressRoute(core, actionCastle)
-    elseif aiLinkType == "R" then
-        return findGridCommonRoute(core, actionCastle)
-    elseif aiLinkType == "L" then
-        return findGridFoolRoute(core, actionCastle)
-    elseif aiLinkType == "S" then
-        return findGridStupidRoute(core, actionCastle)
-    end
-    battleLog:logInfo(string.format("findGridLongRoute error aiLinkType = %s", aiLinkType))
-end
-
-function root:tableConcat(dest, src)
-    local begin = #dest + 1
-
-    local len = #src
-    for i = 0, len - 1 do
-        dest[i + begin] = src[i + 1]
-    end
-    return dest
-end
-
--------------------------
-function root:printToConsole(str)
-    battleLog:logInfo(str)
-end
-
-return root

nodes/battle/lib/utils_bt_grid.lua

@@ -1,646 +0,0 @@
---[[
-    方形之路，格子相关算法处理
-]]
-local root = {}
-
-local printf = print
-
-local MIN_LONG_SIZE = 3
-
-function root:grids_to_color_map(grids)
-    local ret = {}
-
-    for _, v in ipairs(grids) do
-        local x, y = v.x + 1, v.y + 1
-        if not ret[y] then
-            ret[y] = {}
-        end
-        if v:cantLink() then
-            ret[y][x] = -1
-        else
-            ret[y][x] = v.color
-        end
-    end
-
-    return ret
-end
-
-function root:grids_to_id_map(grids)
-    local ret = {}
-
-    for _, v in ipairs(grids) do
-        local x, y = v.x + 1, v.y + 1
-        if not ret[y] then
-            ret[y] = {}
-        end
-        ret[y][x] = v.id
-    end
-
-    return ret
-end
-
-function root:random_map()
-    local w, h = 5, 10
-
-    local ret = {}
-    for y = 1, h do
-        local oneRow = {}
-        for x = 1, w do
-            local color = math.random(1, 4)
-            table.insert(oneRow, color)
-        end
-        table.insert(ret, oneRow)
-    end
-
-    -- 随机3~4次万能色块。注意：可能4次都是同一个格子
-    local allColorCount = math.random(3, 4)
-    for i = 1, allColorCount do
-        local y = math.random(h)
-        local x = math.random(w)
-        ret[y][x] = 5
-    end
-
-    -- local ret = {
-    --     {3, 2, 3, 1, 2},
-    --     {4, 3, 5, 2, 1},
-    --     {3, 3, 3, 2, 3},
-    --     {2, 4, 1, 2, 5},
-    --     {1, 4, 4, 2, 1},
-    --     {5, 1, 4, 2, 4},
-    --     {2, 4, 1, 4, 1},
-    --     {3, 4, 3, 4, 1},
-    --     {3, 3, 4, 2, 4},
-    --     {5, 3, 3, 2, 1}
-    -- }
-
-    return ret
-end
-
-function root:get_half_map(seat, map)
-    local maxH = #map
-    local minY, maxY
-    if seat == 1 then
-        minY, maxY = 1, maxH / 2
-    else
-        minY, maxY = maxH / 2 + 1, maxH
-    end
-
-    local ret = {}
-    for y, v in ipairs(map) do
-        ret[y] = {}
-        for x, vv in ipairs(v) do
-            if y >= minY and y <= maxY then
-                ret[y][x] = vv
-            else
-                ret[y][x] = 0
-            end
-        end
-    end
-    return ret
-end
-
-function root:get_all_long(halfMap)
-    local h = #halfMap
-    local w = #halfMap[1]
-
-    -- 将地图分块
-    local longList = self:split_map(halfMap)
-
-    return longList
-end
-
-function root:split_map(map)
-    local ret = {}
-
-    local h = #map
-    local w = #map[1]
-
-    -- 同色地图字典
-    local sameColorMapDict = {
-        [1] = self:new_zero_map(w, h),
-        [2] = self:new_zero_map(w, h),
-        [3] = self:new_zero_map(w, h),
-        [4] = self:new_zero_map(w, h)
-    }
-    for y, oneRow in ipairs(map) do
-        for x, color in ipairs(oneRow) do
-            if color >= 1 and color <= 4 then
-                local sameColorMap = sameColorMapDict[color]
-                sameColorMap[y][x] = color
-            elseif color == 5 then
-                for _, sameColorMap in ipairs(sameColorMapDict) do
-                    sameColorMap[y][x] = color
-                end
-            end
-        end
-    end
-
-    -- 每种颜色进行分割
-    for _, sameColorMap in ipairs(sameColorMapDict) do
-        local list = self:split_same_color_map(sameColorMap)
-        self:array_merge(ret, list)
-    end
-
-    return ret
-end
-
-function root:split_same_color_map(sameColorMap)
-    local ret = {}
-
-    for y, oneRow in ipairs(sameColorMap) do
-        for x, color in ipairs(oneRow) do
-            if color >= 1 and color <= 4 then
-                sameColorMap[y][x] = 0
-
-                local pos = {x = x, y = y, color = color}
-                local oneLong = {pos}
-
-                self:pickup_one_long(oneLong, sameColorMap, pos)
-                if #oneLong >= MIN_LONG_SIZE then
-                    table.insert(ret, oneLong)
-                end
-            end
-        end
-    end
-
-    return ret
-end
-
-function root:pickup_one_long(oneLong, sameColorMap, pos)
-    local x1 = pos.x
-    local y1 = pos.y
-    local nextPosList = {}
-    -- 九宫格示例
-    -- 1 2 3
-    -- 4 x 6
-    -- 7 8 9
-    local deltaList = {
-        {dx = -1, dy = 1},
-        {dx = 0, dy = 1},
-        {dx = 1, dy = 1},
-        {dx = -1, dy = 0},
-        {dx = 1, dy = 0},
-        {dx = -1, dy = -1},
-        {dx = 0, dy = -1},
-        {dx = 1, dy = -1}
-    }
-    for _, v in ipairs(deltaList) do
-        local x2 = x1 + v.dx
-        local y2 = y1 + v.dy
-        if sameColorMap[y2] and sameColorMap[y2][x2] and sameColorMap[y2][x2] > 0 then
-            local newPos = {x = x2, y = y2, color = sameColorMap[y2][x2]}
-            table.insert(nextPosList, newPos)
-            table.insert(oneLong, newPos)
-            sameColorMap[y2][x2] = 0
-        end
-    end
-
-    for _, v in ipairs(nextPosList) do
-        self:pickup_one_long(oneLong, sameColorMap, v)
-    end
-end
-
-function root:get_map_all_long(seat, map)
-    local halfMap = self:get_half_map(seat, map)
-    -- 要求是长度满足的龙
-    local longList = self:get_all_long(halfMap)
-
-    return longList
-end
-
-function root:get_map_all_link(seat, map)
-    local halfMap = self:get_half_map(seat, map)
-    local h = #halfMap
-    local w = #halfMap[1]
-    local longList = self:get_all_long(halfMap)
-
-    local ret = {}
-    for _, v in ipairs(longList) do
-        local linkList = self:get_long_all_link(v, w, h)
-        self:array_merge(ret, linkList)
-    end
-    return ret
-end
-
-function root:get_long_all_link(long, w, h)
-    local map = self:long_to_map(long, w, h)
-
-    local ret = {}
-    local maxLen = 0
-    for y, oneRow in ipairs(map) do
-        for x, color in ipairs(oneRow) do
-            if color > 0 then
-                local result = {}
-                local links = {}
-                local pos = {x = x, y = y, color = color}
-                self:dfs(result, links, map, pos)
-
-                if #result == maxLen then
-                    if not self:is_same_link(result, ret) then
-                        table.insert(ret, result)
-                    end
-                elseif #result > maxLen and #result >= MIN_LONG_SIZE then
-                    ret = {result}
-                    maxLen = #result
-                end
-            end
-        end
-    end
-
-    return ret
-end
-
-function root:get_map_max_link(seat, map)
-    local halfMap = self:get_half_map(seat, map)
-    local h = #halfMap
-    local w = #halfMap[1]
-    local longList = self:get_all_long(halfMap)
-
-    table.sort(
-        longList,
-        function(a, b)
-            return #a > #b
-        end
-    )
-
-    local maxLink = {}
-    for _, v in ipairs(longList) do
-        if #maxLink >= #v then
-            break
-        end
-
-        local link = self:get_long_max_link(v, w, h)
-        if #link > #maxLink then
-            maxLink = link
-        end
-    end
-    return maxLink
-end
-
-function root:get_map_max_link_list(seat, map)
-    local halfMap = self:get_half_map(seat, map)
-    local h = #halfMap
-    local w = #halfMap[1]
-    local longList = self:get_all_long(halfMap)
-
-    local maxLinkList = {}
-    for _, v in ipairs(longList) do
-        local link = self:get_long_max_link(v, w, h)
-        table.insert(maxLinkList, link)
-    end
-    return maxLinkList
-end
-
-function root:get_long_max_link(long, w, h)
-    local map = self:long_to_map(long, w, h)
-
-    local ret = {}
-    local maxLen = 0
-    for y, oneRow in ipairs(map) do
-        for x, color in ipairs(oneRow) do
-            if color > 0 then
-                local result = {}
-                local links = {}
-                local pos = {x = x, y = y, color = color}
-                self:dfs(result, links, map, pos)
-
-                if #result > maxLen and #result >= MIN_LONG_SIZE then
-                    ret = result
-                    maxLen = #result
-
-                    if #ret == #long then
-                        return ret
-                    end
-                end
-            end
-        end
-    end
-
-    return ret
-end
-
-function root:dfs(result, links, map, pos, nearCountMap)
-    local x, y, tempColor = pos.x, pos.y, pos.color
-    map[y][x] = 0
-    table.insert(links, pos)
-
-    local nearMap = {
-        {x = -1, y = -1},
-        {x = -1, y = 0},
-        {x = -1, y = 1},
-        {x = 0, y = -1},
-        {x = 0, y = 1},
-        {x = 1, y = -1},
-        {x = 1, y = 0},
-        {x = 1, y = 1}
-    }
-    for _, v in ipairs(nearMap) do
-        local x1 = x + v.x
-        local y1 = y + v.y
-        if map[y1] and map[y1][x1] and map[y1][x1] > 0 then
-            local color1 = map[y1][x1]
-            local pos1 = {x = x1, y = y1, color = color1}
-            self:dfs(result, links, map, pos1)
-        end
-    end
-
-    if #links > #result then
-        for ii, vv in ipairs(links) do
-            result[ii] = vv
-        end
-    elseif nearCountMap and #links == #result then
-        local pos1 = links[#links]
-        local pos2 = result[#result]
-        if nearCountMap[pos2.y][pos2.x] < nearCountMap[pos1.y][pos1.x] then
-            for ii, vv in ipairs(links) do
-                result[ii] = vv
-            end
-        end
-    end
-
-    table.remove(links)
-    map[y][x] = tempColor
-end
-
------------------------------- 工具方法 ------------------------------
-
-function root:new_zero_map(w, h)
-    local ret = {}
-
-    for y = 1, h do
-        local oneRow = {}
-        for x = 1, w do
-            table.insert(oneRow, 0)
-        end
-        table.insert(ret, oneRow)
-    end
-
-    return ret
-end
-
-function root:array_merge(dest, src)
-    for _, v in ipairs(src) do
-        table.insert(dest, v)
-    end
-end
-
-function root:long_to_map(long, w, h)
-    local map = self:new_zero_map(w, h)
-
-    for _, v in ipairs(long) do
-        map[v.y][v.x] = v.color
-    end
-
-    return map
-end
-
-function root:map_to_long(map)
-    local long = {}
-
-    for y, oneRow in ipairs(map) do
-        for x, color in ipairs(oneRow) do
-            if color > 0 then
-                table.insert(long, {x = x, y = y, color = color})
-            end
-        end
-    end
-
-    return long
-end
-
---[[ 判断是否同一条连线
-条件1：数量一样
-条件2：首尾一样或相反（落点一样）
-条件3：都是一样的格子
-]]
-function root:is_same_link(link, list)
-    local oneLink = list[1]
-    if #link ~= #oneLink then
-        -- 不是 数量一样
-        return false
-    end
-
-    local linkX1, linkY1 = link[1].x, link[1].y
-    local linkXN, linkYN = link[#link].x, link[#link].y
-    local linkKey = self:get_link_key(link)
-    for _, v in ipairs(list) do
-        local x1, y1 = v[1].x, v[1].y
-        local xN, yN = v[#v].x, v[#v].y
-        if
-            (linkX1 == x1 and linkY1 == y1 and linkXN == xN and linkYN == yN) or
-                (linkX1 == xN and linkY1 == yN and linkXN == x1 and linkYN == y1)
-         then
-            -- 条件2：首尾一样或相反（落点一样）
-            if linkKey == self:get_link_key(link) then
-                -- 条件3：都是一样的格子
-                return true
-            end
-        end
-    end
-
-    return false
-end
-
-function root:get_link_key(link)
-    local list = {}
-    for _, v in ipairs(link) do
-        local x, y = v.x, v.y
-        local flag = y * 10 + x
-        table.insert(list, flag)
-    end
-    table.sort(list)
-
-    return table.concat(list, "")
-end
-
-function root:get_near_pos_count(map, pos)
-    local ret = 0
-
-    local x, y = pos.x, pos.y
-    local nearMap = {
-        {x = -1, y = -1},
-        {x = -1, y = 0},
-        {x = -1, y = 1},
-        {x = 0, y = -1},
-        {x = 0, y = 1},
-        {x = 1, y = -1},
-        {x = 1, y = 0},
-        {x = 1, y = 1}
-    }
-    for _, v in ipairs(nearMap) do
-        local x1 = x + v.x
-        local y1 = y + v.y
-        if map[y1] and map[y1][x1] and map[y1][x1] > 0 then
-            ret = ret + 1
-        end
-    end
-
-    return ret
-end
-
-function root:print_long(formatStr, long, w, h)
-    local map = self:long_to_map(long, w, h)
-    self:print_map(formatStr, map)
-end
-
-function root:print_map(formatStr, map)
-    local middleRow = #map / 2
-
-    local rows = {}
-
-    -- insert 在前面的原因：第一行输出在最后，即下面
-    for y, oneRow in ipairs(map) do
-        local str = string.format("| %s |", table.concat(oneRow, " "))
-        table.insert(rows, 1, str)
-        if y == middleRow then
-            table.insert(rows, 1, "| - - - - - |")
-        end
-    end
-
-    table.insert(rows, 1, "| - - - - - |")
-    table.insert(rows, "| - - - - - |")
-
-    local msg = table.concat(rows, "\n")
-    printf(string.format(formatStr, msg))
-end
-
-function root:print_map_list(formatStr, mapList)
-    local height = #mapList[1]
-    local middleRow = height / 2
-
-    local rows = {}
-    for i = 1, height + 3 do
-        table.insert(rows, "")
-    end
-
-    local rowMap = {}
-    -- y: 01 02 03 04 05 | 06 07 08 09 10
-    -- r: 12 11 10 09 08 | 06 05 04 03 02
-    for i = 1, height do
-        if i <= middleRow then
-            rowMap[i] = height - i + 3 -- 10 - 1 + 3
-        else
-            rowMap[i] = height - i + 2 -- 10 - 6 + 2
-        end
-    end
-
-    for _, v in ipairs(mapList) do
-        for y, oneRow in ipairs(v) do
-            local row = rowMap[y]
-            local str = string.format(" | %s |", table.concat(oneRow, " "))
-            rows[row] = rows[row] .. str
-        end
-
-        rows[1] = rows[1] .. " | - - - - - |"
-        rows[middleRow + 2] = rows[middleRow + 2] .. " | - - - - - |"
-        rows[height + 3] = rows[height + 3] .. " | - - - - - |"
-    end
-
-    local msg = table.concat(rows, "\n")
-    printf(string.format(formatStr, msg))
-end
-
-function root:test()
-    math.randomseed(os.time())
-
-    local map = self:random_map()
-    -- local list = {{1, 1}, {1, 2}, {2, 2}, {3, 2}, {1, 3}, {1, 4}}
-    -- for _, v in ipairs(list) do
-    --     map[v[1]][v[2]] = 0
-    -- end
-    self:print_map("随机一个地图：\n%s", map)
-    printf("")
-
-    local map1 = self:get_half_map(1, map)
-    self:print_map("获取下半部分地图：\n%s", map1)
-    printf("")
-
-    local map2 = self:get_half_map(2, map)
-    self:print_map("获取上半部分地图：\n%s", map2)
-    printf("")
-
-    printf("获取上半部分地图的所有龙：")
-    local map2 = self:get_half_map(2, map)
-    local h = #map2
-    local w = #map2[1]
-    local longList = self:get_all_long(map2)
-    for i, v in ipairs(longList) do
-        local formatStr = "龙" .. i .. "：\n%s"
-        self:print_long(formatStr, v, w, h)
-    end
-    printf("")
-
-    printf("获取上半部分地图的所有最长连线：")
-    local linkList = self:get_map_all_link(2, map)
-    for i, v in ipairs(linkList) do
-        local formatStr = "连线" .. i .. "：\n%s"
-        self:print_long(formatStr, v, w, h)
-    end
-    printf("")
-
-    printf("获取上半部分地图的最长连线：")
-    local link = self:get_map_max_link(2, map)
-    local formatStr = "最长连线：\n%s"
-    self:print_long(formatStr, link, w, h)
-    printf("")
-
-    printf("获取上半部分地图的最长连线列表：")
-    local linkList = self:get_map_max_link_list(2, map)
-    for i, v in ipairs(linkList) do
-        local formatStr = "最长连线" .. i .. "：\n%s"
-        self:print_long(formatStr, v, w, h)
-    end
-    printf("")
-end
-
-function root:test_time(count)
-    math.randomseed(os.time())
-
-    local errorCount = 0
-    for i = 1, count do
-        local map = self:random_map()
-
-        -- local map2 = self:get_half_map(2, map)
-        -- self:get_all_long(map2)
-
-        local linkList = self:get_map_all_link(2, map)
-        -- local maxLink1 = {}
-        -- for _, v in ipairs(linkList) do
-        --     if #v > #maxLink1 then
-        --         maxLink1 = v
-        --     end
-        -- end
-    end
-
-    printf("error count " .. errorCount)
-end
-
-
-return root

nodes/battle/lib/utils_bt_supply.lua

@@ -1,503 +0,0 @@
-local utils_bt_grid = require("utils_bt_grid")
-local battleAdapt = require "adapt.battleAdapt"
-local battleConst = require "battle.battleConst"
-
-local root = {}
-
-local function log2Client(core, logStr)
-    if not core then
-        print(logStr)
-        return
-    end
-    core:notifyClientLog(logStr)
-end
-
-function root:supply_grids(core, seat, grids, supplyType, is2v2)
-    -- 每个颜色的数量
-    local colorCountMap = {0, 0, 0, 0}
-    local hasUpdate = false
-    for _, v in ipairs(grids) do
-        local color = v.color
-        if color >= 1 and color <= 4 then
-            colorCountMap[color] = colorCountMap[color] + 1
-        elseif color == 0 then
-            hasUpdate = true
-        end
-    end
-
-    if not hasUpdate then
-        -- 无需色块补充
-        return
-    end
-
-    self:_drop(seat, grids)
-
-    local colorMap = utils_bt_grid:grids_to_color_map(grids)
-
-    -- 判断A类和B类是否启用，不启动的话，需要替换成L类
-    if string.find(supplyType, "A") == 1 or string.find(supplyType, "B") == 1 then
-        local linkInfo5 = self:_get_link_len_info(seat, colorMap, 5)
-        local more5, count5 = linkInfo5.moreLen, linkInfo5.countLen
-        local msg = string.format("色块补充日志：补充前状态 连线长度为5的数量: %d, 是否有长度超过5的连线: %s", count5, more5)
-        log2Client(core, msg)
-
-        if string.find(supplyType, "A") == 1 then
-            if not (more5 or count5 >= 2) then
-                -- A类色块补充，替换为L类色块补充
-                supplyType = string.gsub(supplyType, "A", "L")
-            else
-                supplyType = "A"
-            end
-        else
-            if not (more5 or count5 >= 1) then
-                -- B类色块补充，替换为L类色块补充
-                supplyType = string.gsub(supplyType, "B", "L")
-            else
-                supplyType = "B"
-            end
-        end
-    end
-    log2Client(core, string.format("色块补充日志：色块补充方案: %s", supplyType))
-
-    -- updateList里，x：1~5，y：1~10
-    local updateList
-    if supplyType == "A" or supplyType == "B" then
-        updateList = self:_supply_ab(core, seat, colorMap, colorCountMap, supplyType)
-    elseif string.find(supplyType, "L") == 1 then
-        updateList = self:_supply_l(core, seat, colorMap, colorCountMap, supplyType)
-    elseif string.find(supplyType, "W") == 1 or string.find(supplyType, "R") == 1 then
-        updateList = self:_supply_wr(core, seat, colorMap, colorCountMap, supplyType)
-    else
-        print("ERROR: 非法色块补充方案")
-    end
-
-    if updateList and #updateList > 0 then
-        for _, v in ipairs(updateList) do
-            local x, y = v.x - 1, v.y - 1
-            self:_set_color(grids, x, y, v.color)
-        end
-
-        -- 补充万能色块的逻辑
-        local colorMap2 = utils_bt_grid:grids_to_color_map(grids)
-        local linkInfo4 = self:_get_link_len_info(seat, colorMap2, 4)
-        local more4, count4 = linkInfo4.moreLen, linkInfo4.countLen
-        local msg = string.format("色块补充日志：补充后状态 连线长度为4的数量: %d, 是否有长度超过4的连线: %s", count4, more4)
-        log2Client(core, msg)
-        local maxCount4 = is2v2 and 2 or 1
-        if count4 <= maxCount4 and not more4 then
-            local pos = updateList[math.random(#updateList)]
-            local x, y = pos.x - 1, pos.y - 1
-            self:_set_color(grids, x, y, battleConst.COLOR_TYPE.ALL)
-
-            local msg = string.format("色块补充日志：符合变万能色块逻辑 (%d, %d) 变为万能色块", x, y)
-            log2Client(core, msg)
-        end
-    end
-end
-
-function root:_drop(seat, grids)
-    --[[
-        seat: 当前回合操作的座位
-            1：下方操作，色块往下掉落，该列非空色块的y -1
-            2：上方操作，色块往上掉落，该列非空色块的y +1
-    ]]
-    local tempGridMap = {}
-    local maxX = 0
-    local maxY = 0
-    for _, v in ipairs(grids) do
-        local row, col = v.y + 1, v.x + 1
-        if not tempGridMap[row] then
-            tempGridMap[row] = {}
-        end
-        tempGridMap[row][col] = v
-
-        maxX = math.max(maxX, col)
-        maxY = math.max(maxY, row)
-    end
-    local w, h = maxX, maxY
-
-    local startY, endY, stepY
-    if seat == 1 then
-        startY, endY, stepY = 1, h, 1
-    else
-        startY, endY, stepY = h, 1, -1
-    end
-
-    for col = 1, w do
-        local emptyCount = 0
-        for row = startY, endY, stepY do
-            local grid = tempGridMap[row][col]
-            if grid.color == 0 then
-                emptyCount = emptyCount + 1
-
-                -- 例如：第2格空的，补充到倒数第2行。y=10-1*(2-1)
-                grid.y = endY - stepY * (emptyCount - 1) - 1
-            else
-                -- 例如：第9行往下掉2格。y=9-1*2
-                grid.y = grid.y - stepY * emptyCount
-            end
-        end
-    end
-end
-
---[[ 判断“当前操作的敌方”可连线长度的情况
-    moreLen: 连线长度为 len 的数量
-    countLen: 是否有长度超过 len 的连线
-]]
-function root:_get_link_len_info(seat, colorMap, len)
-    local otherSeat = seat == 1 and 2 or 1
-    local links = utils_bt_grid:get_map_max_link_list(otherSeat, colorMap)
-
-    local countLen = 0
-    local moreLen = false
-    for _, v in ipairs(links) do
-        if #v > len then
-            moreLen = true
-            break
-        elseif #v == len then
-            countLen = countLen + 1
-        end
-    end
-
-    return {countLen = countLen, moreLen = moreLen}
-end
-
-function root:_supply_l(core, seat, colorMap, colorCountMap, supplyType)
-    local ret = {}
-
-    -- 特殊补充色块一方：当前操作的我方。随机补充
-    local supplyPosList2 = self:_get_supply_pos_list(seat, colorMap)
-    for _, v in ipairs(supplyPosList2) do
-        local color = math.random(1, 4)
-        table.insert(ret, {x = v.x, y = v.y, color = color})
-    end
-
-    -- 正常补充色块一方：当前操作的敌方。按方案补充
-    local otherSeat = seat == 1 and 2 or 1
-    local halfMap = utils_bt_grid:get_half_map(otherSeat, colorMap)
-    local supplyPosList1 = self:_get_supply_pos_list(otherSeat, colorMap)
-
-    -- 半场每个颜色的数量记录
-    local halfCountMap = {0, 0, 0, 0}
-    for _, v in ipairs(halfMap) do
-        for _, vv in ipairs(v) do
-            if vv >= 1 and vv <= 4 then
-                halfCountMap[vv] = halfCountMap[vv] + 1
-            end
-        end
-    end
-
-    -- 排序一下
-    table.sort(
-        supplyPosList1,
-        function(a, b)
-            if a.y ~= b.y then
-                if otherSeat == 1 then
-                    return a.y > b.y
-                else
-                    return a.y < b.y
-                end
-            else
-                return a.x < b.x
-            end
-        end
-    )
-
-    for _, v in ipairs(supplyPosList1) do
-        local x, y = v.x, v.y
-
-        local okColorList = {1, 2, 3, 4}
-        local okColorWeightList = {}
-        for _, v in ipairs(okColorList) do
-            local allCount = halfCountMap[v]
-            local weight = battleAdapt:getColorWeight(allCount, supplyType)
-            table.insert(okColorWeightList, {v, weight})
-        end
-        local tempColor = self:random_with_weight(okColorWeightList)
-        local msg = string.format("色块补充日志：L类色块补充权重: %s, 色块补充颜色: %s", tostring(okColorWeightList), tempColor)
-        log2Client(core, msg)
-
-        halfCountMap[tempColor] = halfCountMap[tempColor] + 1
-        halfMap[y][x] = tempColor
-        table.insert(ret, {x = x, y = y, color = tempColor})
-    end
-
-    return ret
-end
-
-function root:_supply_wr(core, seat, colorMap, colorCountMap, supplyType)
-    local ret = {}
-
-    -- 每个颜色补充的数量记录
-    local suppleCountMap = {0, 0, 0, 0}
-
-    -- 特殊补充色块一方：当前操作的我方。随机补充
-    local supplyPosList2 = self:_get_supply_pos_list(seat, colorMap)
-    for _, v in ipairs(supplyPosList2) do
-        local color = math.random(1, 4)
-        table.insert(ret, {x = v.x, y = v.y, color = color})
-
-        suppleCountMap[color] = suppleCountMap[color] + 1
-    end
-
-    -- 正常补充色块一方：当前操作的敌方。按方案补充
-    local otherSeat = seat == 1 and 2 or 1
-    local halfMap = utils_bt_grid:get_half_map(otherSeat, colorMap)
-    local supplyPosList1 = self:_get_supply_pos_list(otherSeat, colorMap)
-
-    -- 排序一下
-    table.sort(
-        supplyPosList1,
-        function(a, b)
-            if a.y ~= b.y then
-                if otherSeat == 1 then
-                    return a.y > b.y
-                else
-                    return a.y < b.y
-                end
-            else
-                return a.x < b.x
-            end
-        end
-    )
-
-    for _, v in ipairs(supplyPosList1) do
-        local x, y = v.x, v.y
-
-        local okColorList = {1, 2, 3, 4}
-        local okColorWeightList = {}
-        for _, v in ipairs(okColorList) do
-            local allCount = colorCountMap[v] + suppleCountMap[v]
-            local weight = battleAdapt:getColorWeight(allCount, supplyType)
-            table.insert(okColorWeightList, {v, weight})
-        end
-        local tempColor = self:random_with_weight(okColorWeightList)
-        local msg = string.format("色块补充日志：WR类色块补充权重: %s, 色块补充颜色: %s", tostring(okColorWeightList), tempColor)
-        log2Client(core, msg)
-
-        suppleCountMap[tempColor] = suppleCountMap[tempColor] + 1
-        halfMap[y][x] = tempColor
-        table.insert(ret, {x = x, y = y, color = tempColor})
-    end
-
-    return ret
-end
-
-function root:_supply_ab(core, seat, colorMap, colorCountMap, supplyType)
-    local ret = {}
-
-    -- 每个颜色补充的数量记录
-    local suppleCountMap = {0, 0, 0, 0}
-
-    -- 特殊补充色块一方：当前操作的我方。随机补充
-    local supplyPosList2 = self:_get_supply_pos_list(seat, colorMap)
-    for _, v in ipairs(supplyPosList2) do
-        local color = math.random(1, 4)
-        table.insert(ret, {x = v.x, y = v.y, color = color})
-
-        suppleCountMap[color] = suppleCountMap[color] + 1
-    end
-
-    -- 正常补充色块一方：当前操作的敌方。按方案补充
-    local otherSeat = seat == 1 and 2 or 1
-    local halfMap = utils_bt_grid:get_half_map(otherSeat, colorMap)
-    local supplyPosList1 = self:_get_supply_pos_list(otherSeat, colorMap)
-
-    -- 排序一下
-    table.sort(
-        supplyPosList1,
-        function(a, b)
-            if a.y ~= b.y then
-                if otherSeat == 1 then
-                    return a.y > b.y
-                else
-                    return a.y < b.y
-                end
-            else
-                return a.x < b.x
-            end
-        end
-    )
-
-    for _, v in ipairs(supplyPosList1) do
-        local x, y = v.x, v.y
-
-        local okColorList = {}
-        local maxLen = 4
-        for color = 1, 4 do
-            halfMap[y][x] = color
-
-            local sameList = {}
-            local nextPos = {x = x, y = y}
-            self:_find_same_color_list(halfMap, sameList, nextPos, color)
-            if #sameList <= maxLen then
-                table.insert(okColorList, color)
-            end
-        end
-
-        if #okColorList == 0 then
-            okColorList = {1, 2, 3, 4}
-        end
-
-        local okColorWeightList = {}
-        for _, v in ipairs(okColorList) do
-            local allCount = colorCountMap[v] + suppleCountMap[v]
-            local weight = battleAdapt:getColorWeight(allCount, supplyType)
-            table.insert(okColorWeightList, {v, weight})
-        end
-        local tempColor = self:random_with_weight(okColorWeightList)
-        local msg = string.format("色块补充日志：AB类色块补充权重: %s, 色块补充颜色: %s", tostring(okColorWeightList), tempColor)
-        log2Client(core, msg)
-
-        suppleCountMap[tempColor] = suppleCountMap[tempColor] + 1
-        halfMap[y][x] = tempColor
-        table.insert(ret, {x = x, y = y, color = tempColor})
-    end
-
-    return ret
-end
-
-function root:_get_supply_pos_list(seat, colorMap)
-    local maxH = #colorMap
-    local minY, maxY
-    if seat == 1 then
-        minY, maxY = 1, maxH / 2
-    else
-        minY, maxY = maxH / 2 + 1, maxH
-    end
-
-    local ret = {}
-    for y = minY, maxY do
-        local oneRow = colorMap[y]
-        for x, color in ipairs(oneRow) do
-            if color == 0 then
-                table.insert(ret, {x = x, y = y})
-            end
-        end
-    end
-
-    return ret
-end
-
-function root:_find_same_color_list(map, sameList, nextPos, color)
-    local x1 = nextPos.x
-    local y1 = nextPos.y
-
-    for _, v in ipairs(sameList) do
-        if v.x == x1 and v.y == y1 then
-            -- 已经添加过了，跳过
-            return
-        end
-    end
-
-    table.insert(sameList, nextPos)
-
-    -- 九宫格示例
-    -- 1 2 3
-    -- 4 x 6
-    -- 7 8 9
-    local deltaList = {
-        {dx = -1, dy = 1},
-        {dx = 0, dy = 1},
-        {dx = 1, dy = 1},
-        {dx = -1, dy = 0},
-        {dx = 1, dy = 0},
-        {dx = -1, dy = -1},
-        {dx = 0, dy = -1},
-        {dx = 1, dy = -1}
-    }
-    for _, v in ipairs(deltaList) do
-        local x2 = x1 + v.dx
-        local y2 = y1 + v.dy
-        if map[y2] and map[y2][x2] and (map[y2][x2] == color or map[y2][x2] == 5) then
-            self:_find_same_color_list(map, sameList, {x = x2, y = y2}, color)
-        end
-    end
-end
-
-function root:_set_color(grids, x, y, color)
-    for _, v in ipairs(grids) do
-        if x == v.x and y == v.y then
-            v.color = color
-            break
-        end
-    end
-end
-
-function root:_get_weight(count, supplyType)
-    if count > 15 then
-        return 0
-    else
-        return 15 - count
-    end
-end
-
-function root:random_index_with_weights(list)
-    local sum = 0
-    for _, v in ipairs(list) do
-        sum = sum + v
-    end
-
-    local ret = 1
-    if sum > 0 then
-        local r = math.random(1, sum)
-
-        local didSum = 0
-        for i, v in ipairs(list) do
-            didSum = didSum + v
-            if r <= didSum then
-                ret = i
-                break
-            end
-        end
-    end
-
-    return ret
-end
-
-function root:random_with_weight(data)
-    local weights = {}
-    for _, v in ipairs(data) do
-        table.insert(weights, v[2])
-    end
-
-    local index = self:random_index_with_weights(weights)
-    return data[index][1]
-end
-
-function root:test()
-    local seat = 1
-    local grids = {}
-    local supplyType = "A"
-
-    for x = 0, 4 do
-        for y = 0, 9 do
-            table.insert(grids, {x = x, y = y, color = math.random(1, 5)})
-        end
-    end
-
-    local list = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}
-    for _, v in ipairs(list) do
-        grids[v].color = 0
-    end
-
-    local colorMap = utils_bt_grid:grids_to_color_map(grids)
-    utils_bt_grid:print_map("===1 %s", colorMap)
-
-    self:supply_grids(nil, seat, grids, supplyType, false)
-
-    local colorMap = utils_bt_grid:grids_to_color_map(grids)
-    utils_bt_grid:print_map("===2 %s", colorMap)
-end
-
-
-return root

nodes/battle/main.lua

@@ -1,35 +0,0 @@
---[[
-Author: neo
-Date: 2021-05-31 11:12:16
-LastEditTime: 2021-06-01 10:49:54
-LastEditors: Please set LastEditors
-Description: 游戏战斗服
---]]
-local skynet = require "skynet"
-require "skynet.manager"
-local init_nodes = require("init_nodes")
-
-skynet.start(
-    function()
-        -- 初始化控制台
-        init_nodes:init_console()
-
-        -- 日志
-        init_nodes:init_logger()
-        -- 数据库
-        init_nodes:init_mysql()
-        -- redis
-        init_nodes:init_redis()
-        -- 配置
-        init_nodes:init_config()
-
-        skynet.uniqueservice("srvBattleMgr")
-
-        -- 集群
-        init_nodes:init_cluster()
-
-        skynet.send(".steward", "lua", "node_hb_to_master", "battlemaster")
-
-        skynet.exit()
-    end
-)

nodes/battle/service/srvBattle.lua

@@ -1,113 +0,0 @@
---[[
-Author: neo
-Date: 2021-05-31 14:40:54
-LastEditTime: 2021-06-28 20:56:43
-LastEditors: Please set LastEditors
-Description: battle agent
---]]
-local skynet = require "skynet"
-local battle = require "battle"
-local baseService = require("baseService")
-local battleCode = require "battle.battleCode"
-
-local root = {}
-
-local mapBattleObj = {} -- string.format("%s:%s:%s", matchNode, matchId, battleId) -> battleObj
-
-function root.start_battle(matchInfo, playerList, viewerList, battleParams, settleNodeInfo)
-    local objBattle = battle.new(matchInfo, battleParams, settleNodeInfo)
-    mapBattleObj[matchInfo.battleId] = objBattle
-    objBattle:startBattle(playerList, viewerList)
-    root.start_tick_timer()
-    -- 通知 battleMgr
-    skynet.call(".BattleMgr", "lua", "battleEnter", matchInfo.battleId, skynet.self())
-    return true
-end
-
-function root.is_user_in_battle(uid, battleId)
-    if uid == nil or battleId == nil then
-        return false
-    end
-    local objBattle = mapBattleObj[battleId]
-    if objBattle == nil then
-        return false
-    end
-    if objBattle:is_user_in_battle(uid) then
-        return true
-    end
-    return false
-end
-
-function root.start_tick_timer()
-    if root.timer then
-        return
-    end
-    root.timer =
-        create_timeout(
-        100,
-        function()
-            root.tick_time_out()
-        end
-    )
-end
-
-function root.tick_time_out()
-    if root.timer then
-        root.timer.delete()
-        root.timer = nil
-    end
-
-    local unactiveList = nil
-    for k, v in pairs(mapBattleObj) do
-        if v.isActive then
-            v.core:do_tick()
-        else
-            if unactiveList == nil then
-                unactiveList = {}
-            end
-            table.insert(unactiveList, k)
-        end
-    end
-    -- 清除非活跃战斗
-    if unactiveList then
-        for _, v in ipairs(unactiveList) do
-            log.info("tick_time_out 释放战斗[%s]", tostring(v))
-            mapBattleObj[v] = nil
-        end
-    end
-
-    root.start_tick_timer()
-end
-
-function root.forward(battleId, cmd, ...)
-    if battleId == nil or is_empty(cmd) then
-        log.error("battle error: battleId[%s] cmd[%s]", tostring(battleId), tostring(cmd))
-        error("battle session error")
-    end
-    local objBattle = mapBattleObj[battleId]
-    -- 已销毁/非活跃战斗
-    if not objBattle or not objBattle.isActive then
-        log.error("battle obj not exists, battleId = %s, cmd = %s", battleId, tostring(cmd))
-        -- error("battle obj not exists")
-        return {code = battleCode.BATTLE_NOT_EXIST}
-    end
-    local func = battle[cmd]
-    if not func then
-        error("battle func error")
-    end
-    return func(objBattle, ...)
-end
-
-function root.onStart()
-    math.randomseed(tostring(os.time()) .. skynet.self())
-end
-
-function root.recycle()
-    skynet.exit()
-end
-
-baseService.start(root)

nodes/battle/service/srvBattleMgr.lua

@@ -1,45 +0,0 @@
---[[
-Author: neo
-Date: 2021-05-31 14:14:53
-LastEditTime: 2021-06-01 11:00:59
-LastEditors: Please set LastEditors
-Description: battle agent 管理服务
---]]
-local const = require "const.const"
-local skynet = require "skynet"
-
-local agentPool = require "agentPool"
-local baseService = require("baseService")
-
-local pool
-
-local CMD = {}
-
-function CMD.getBattleAgent()
-    return pool:alloc_agent_srv()
-end
-
-function CMD.battleEnter(id, battleAgent)
-    pool:bind_agent(id, battleAgent)
-end
-
-function CMD.battleLeave(id, battleAgent)
-    pool:unbind_agent(id, battleAgent)
-end
-
-function CMD.is_user_in_battle(uid, battleId, battleAgent)
-    if battleAgent == nil or not pool:get_agent_info_by_addr(battleAgent) then
-        return false
-    end
-    local ok = skynet.call(battleAgent, "lua", "is_user_in_battle", uid, battleId)
-    return ok
-end
-
-function CMD.onStart()
-    pool = agentPool.new("srvBattle", const.INIT_AGENT_COUNT)
-end
-
-baseService.start(CMD, ".BattleMgr", true)

nodes/battlemaster/main.lua

@@ -1,33 +0,0 @@
---[[
-Author: neo
-Date: 2021-05-27 11:56:14
-LastEditTime: 2021-05-27 19:20:29
-LastEditors: Please set LastEditors
-Description: 游戏业务节点分配服
---]]
-local skynet = require "skynet"
-require "skynet.manager"
-local init_nodes = require("init_nodes")
-
-skynet.start(
-    function()
-        -- 初始化控制台
-        init_nodes:init_console()
-
-        -- 日志
-        init_nodes:init_logger()
-        -- 数据库
-        init_nodes:init_mysql()
-        -- redis
-        init_nodes:init_redis()
-        -- 配置
-        init_nodes:init_config()
-
-        skynet.uniqueservice("srvNodeMgr")
-
-        -- 集群
-        init_nodes:init_cluster()
-
-        skynet.exit()
-    end
-)

nodes/battlemaster/service/srvNodeMgr.lua

@@ -1,300 +0,0 @@
---[[
-Author: neo
-Date: 2021-05-27 14:43:17
-LastEditTime: 2021-05-31 20:52:30
-LastEditors: Please set LastEditors
-Description: 游戏业务节点分配服务
---]]
-local baseService = require("baseService")
-local nodeMgr = require("nodeMgr")
-local util_node = require("utils.util_node")
-local lib_game_redis = require("lib_game_redis")
-
-local root = {}
-
-
-function root.start_timer_heart_beat()
-    root.timerHeatBeat =
-        create_timeout(
-        500,
-        function()
-            root.timer_out_heart_beat()
-        end
-    )
-end
-function root.timer_out_heart_beat()
-    root.timerHeatBeat.delete()
-    root.timerHeatBeat = nil
-
-    root.start_timer_heart_beat()
-
-    if root.mapCluster == nil then
-        return
-    end
-
-    local currTime = skynet_time()
-    for k, v in pairs(root.mapCluster) do
-        local isUpdate = false
-        for _k, _v in pairs(v) do
-            if _v.isAlive and currTime >= _v.updateTime + 20 then
-                _v.isAlive = false
-                log.warning("节点[%s]已失效", tostring(_v.nodeName))
-                isUpdate = true
-            end
-        end
-        if isUpdate then
-            root.update_weight(k)
-        end
-    end
-end
-
-function root.node_heart_beat(nodeInfo)
-    if is_empty(nodeInfo) or is_empty(nodeInfo.clusterName) or is_empty(nodeInfo.nodeName) then
-        return false
-    end
-    local clusterName = nodeInfo.clusterName
-    local nodeName = nodeInfo.nodeName
-    if root.mapCluster == nil then
-        root.mapCluster = {}
-    end
-    if root.mapCluster[clusterName] == nil then
-        root.mapCluster[clusterName] = {}
-    end
-    nodeInfo.updateTime = skynet_time()
-    nodeInfo.isAlive = true
-
-    -- 是否更新权重
-    local nInfo = root.get_cluster_node_info(clusterName, nodeName)
-    -- 重新加入节点
-    if nInfo == nil or not nInfo.isAlive then
-        util_node:node_load_init_grains(nodeName)
-    end
-    local isUpdateWeight = false
-    if nInfo == nil or not nInfo.isAlive or nInfo.weight ~= nodeInfo.weight then
-        isUpdateWeight = true
-    end
-    root.mapCluster[clusterName][nodeName] = nodeInfo
-
-    -- 更新权重
-    if isUpdateWeight then
-        root.update_weight(clusterName)
-    end
-
-    return true
-end
-function root.node_stop(clusterName, nodeName)
-    if is_empty(clusterName) or is_empty(nodeName) then
-        return false
-    end
-    if root.mapCluster[clusterName] == nil then
-        return false
-    end
-    if root.mapCluster[clusterName][nodeName] == nil then
-        return false
-    end
-    root.mapCluster[clusterName][nodeName].isAlive = false
-
-    -- 更新权重
-    root.update_weight(clusterName)
-    return true
-end
-function root.update_weight(clusterName)
-    if root.mapClusterWeight == nil then
-        root.mapClusterWeight = {}
-    end
-    local weightInfo = {}
-    weightInfo.total = 0
-    weightInfo.list = {}
-    for k, v in pairs(root.mapCluster[clusterName]) do
-        if v.isAlive then
-            local info = {}
-            info.nodeName = v.nodeName
-            info.min = weightInfo.total + 1
-            weightInfo.total = weightInfo.total + (v.weight or 0)
-            info.max = weightInfo.total
-            table.insert(weightInfo.list, info)
-        end
-    end
-    root.mapClusterWeight[clusterName] = weightInfo
-end
-
-function root.get_cluster_node_info(clusterName, nodeName)
-    if is_empty(clusterName) or is_empty(nodeName) then
-        return
-    end
-    if root.mapCluster == nil or root.mapCluster[clusterName] == nil then
-        return
-    end
-    return root.mapCluster[clusterName][nodeName]
-end
-function root.user_band_node(uid, clusterName, nodeName)
-    if uid == nil then
-        return false
-    end
-    if root.mapUid2NodeInfo == nil then
-        root.mapUid2NodeInfo = {}
-    end
-    if root.mapUid2NodeInfo[uid] == nil then
-        root.mapUid2NodeInfo[uid] = {}
-    end
-    root.mapUid2NodeInfo[uid][clusterName] = nodeName
-    return true
-end
-function root.dispatch_match_node(uid, conf)
-    -- TODO:根据match节点下匹配队列人数分配
-    -- 本地管理匹配队列玩家列表？
-    local clusterName = "match"
-    -- 按照负载集中分配
-    local nodeName = root.user_dispatch_node_by_grain(uid, clusterName)
-    if is_empty(nodeName) then
-        -- 按照权重分配
-        nodeName = root.user_dispatch_node_by_weight(uid, clusterName)
-    end
-    if not is_empty(nodeName) then
-        root.user_band_node(uid, clusterName, nodeName)
-        return nodeName
-    end
-end
-function root.dispatch_battle_node(uid)
-    -- 按照权重做负载均衡
-    local clusterName = "battle"
-    local nodeName = root.user_dispatch_node_by_weight(uid, clusterName)
-    root.user_band_node(uid, clusterName, nodeName)
-    if is_empty(nodeName) then
-        return
-    end
-
-    -- 全服 - 战斗ID
-    local battleId = lib_game_redis:hincrby("battle", "id", 1)
-    if battleId >= 1000000000 then
-        battleId = 1
-        lib_game_redis:hset("battle", "id", battleId)
-    end
-
-    local ret = {}
-    ret.battleNode = nodeName
-    ret.battleId = battleId
-    return ret
-end
-
-function root.get_total_battle_count()
-    if root.mapCluster == nil or root.mapCluster["match"] == nil then
-        return 0
-    end
-    local count = 0
-    for k, v in pairs(root.mapCluster["match"]) do
-        local ok, battleCount = nodeMgr.call(v.nodeName, ".BattleMatch", "getBattleCount")
-        if ok and battleCount then
-            count = count + battleCount
-        end
-    end
-    return count
-end
-
-function root.get_cluster_node_list(clusterName)
-    if is_empty(clusterName) then
-        return
-    end
-    if root.mapCluster == nil or root.mapCluster[clusterName] == nil then
-        return
-    end
-    local nodeList = {}
-    for k, v in pairs(root.mapCluster[clusterName]) do
-        if v.isAlive then
-            table.insert(nodeList, v.nodeName)
-        end
-    end
-    return nodeList
-end
-
-----------------------------------------
-----------------------------------------
-function root.user_dispatch_node_by_weight(uid, clusterName)
-    if is_empty(clusterName) then
-        return
-    end
-    if root.mapCluster == nil then
-        return
-    end
-    if root.mapCluster[clusterName] == nil then
-        return
-    end
-    -- 已分配
-    if uid and root.mapUid2NodeInfo and root.mapUid2NodeInfo[uid] and root.mapUid2NodeInfo[uid][clusterName] then
-        local nodeName = root.mapUid2NodeInfo[uid][clusterName]
-        local nodeInfo = root.get_cluster_node_info(clusterName, nodeName)
-        if nodeInfo and nodeInfo.isAlive then
-            return nodeName
-        end
-    end
-    local rand = math.random(1, root.mapClusterWeight[clusterName].total)
-    for k, v in ipairs(root.mapClusterWeight[clusterName].list) do
-        if v.min <= rand and rand <= v.max then
-            log.info("user_dispatch_node_by_weight uid[%s] nodeName[%s]", tostring(uid), tostring(v.nodeName))
-            return v.nodeName
-        end
-    end
-end
-function root.user_dispatch_node_by_grain(uid, clusterName)
-    if is_empty(clusterName) or root.mapCluster == nil or root.mapCluster[clusterName] == nil then
-        return
-    end
-    -- 已分配
-    if uid and root.mapUid2NodeInfo and root.mapUid2NodeInfo[uid] and root.mapUid2NodeInfo[uid][clusterName] then
-        local nodeName = root.mapUid2NodeInfo[uid][clusterName]
-        local nodeInfo = root.get_cluster_node_info(clusterName, nodeName)
-        if nodeInfo and nodeInfo.isAlive then
-            return nodeName
-        end
-    end
-    -- 按顺序分配
-    local firstNode = nil
-    for k, v in pairs(root.mapCluster[clusterName]) do
-        -- 首个节点
-        if firstNode == nil then
-            firstNode = v.nodeName
-        end
-        -- 该节点当前负载
-        local grains = util_node:node_load_get_grains(k)
-        if grains < v.weight * 10 then
-            log.info(
-                "user_dispatch_node_by_grain clusterName[%s] uid[%s] nodeName[%s]",
-                tostring(clusterName),
-                tostring(uid),
-                tostring(v.nodeName)
-            )
-            return v.nodeName
-        end
-    end
-    -- 找不到节点，返回首个节点
-    log.info(
-        "user_dispatch_node_by_grain clusterName[%s] uid[%s] firstNode[%s]",
-        tostring(clusterName),
-        tostring(uid),
-        tostring(firstNode)
-    )
-    return firstNode
-end
-
-function root.onStart()
-    root.start_timer_heart_beat()
-end
-
-baseService.start(root, ".srvNodeMgr", true)

nodes/global/service/mailSrv.lua

@@ -28,7 +28,6 @@ local function l_del_expire_mail()
 		tostring(currTime)
 	)
 	local ret = lib_game_mysql:query(sql)
-	log.info("l_del_expire_mail sql[%s] ret[%s]", tostring(sql), tostring(ret))
 
 	-- 删除保留邮件
 	local expireTime = currTime - 3600 * 24 * 30
@@ -45,7 +44,6 @@ local function l_expire_items_mail()
 		"SELECT * FROM `mdl_mail` WHERE expireTime < %s and JSON_LENGTH(items) > 0 limit 100;",
 		tostring(currTime)
 	)
-	log.info("l_expire_items_mail sql[%s]", tostring(sql))
 
 	local ret = lib_game_mysql:query(sql)
 	if ret.errno and ret.errno > 0 then

run/common/battle.conf

@@ -1,18 +0,0 @@
-include "public.conf"
-
-clusterName = "battle"
-nodeName = "battle"
-
-lroot = root.."nodes/"..clusterName.."/"
-luaservice = luaservice..lroot.."service/?.lua;"..lroot.."?.lua;"
-lua_path = lua_path..lroot.."?.lua;"..lroot.."service/?.lua;"..lroot.."lib/?.lua;"
-snax = luaservice
-
-start = "main"
-
-if system == "linux" then
-daemon = "./skynet_"..nodeName..".pid"
-end

run/common/clustername.lua

@@ -4,5 +4,3 @@ global = "127.0.0.1:3002"
 login = "127.0.0.1:3003"
 gate1_1 = "127.0.0.1:3004"
 game1_1 = "127.0.0.1:3005"
-battlemaster = "127.0.0.1:3006"
-battle1_1 = "127.0.0.1:3007"