diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua index 332808d..464cc71 100644 --- a/src/actions/AdvAction.lua +++ b/src/actions/AdvAction.lua @@ -235,7 +235,8 @@ function _M.startHangRpc(agent, data) + 0.226 * player["hit"] + 0.26 * player["miss"] - if battleV < campSiteData.idleValue then return 9 end -- 战斗力是否满足 + --print(math.ceil(battleV), campSiteData.idleValue) + if math.ceil(battleV) < campSiteData.idleValue then return 9 end -- 战斗力是否满足 local info = {} info.format = {} diff --git a/src/csvdata b/src/csvdata index 7320a5f..516f9d3 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 7320a5f8d782d63b7ad6fc6e310e3f7425c280a1 +Subproject commit 516f9d34ccb5dfc9a5fd40c251f3229e5a4651e6 diff --git a/src/models/HeroPlugin.lua b/src/models/HeroPlugin.lua index b26732e..876a4e5 100644 --- a/src/models/HeroPlugin.lua +++ b/src/models/HeroPlugin.lua @@ -53,22 +53,25 @@ function HeroPlugin.bind(Hero) local talentAttrS = {} -- 四个基础属性 - local curData = csvdb["unit_talentCsv"][talent:getv(0, 1)] - local curTalentLvl = 0 - if not curData then -- 已经满阶段了 - local cfgName = "unit_talent_"..heroCfgId.."Csv" - curData = csvdb[cfgName][#csvdb[cfgName]] - else - curTalentLvl = talent:getv(1, 1) - end - for lvl, cfg in pairs(curData) do - if lvl < curTalentLvl or curTalentLvl == 0 then - if cfg.effect ~= 99 then - local curVal = talentAttrS[cfg.effect] or 0 - if curVal < cfg.strength then - talentAttrS[cfg.effect] = cfg.strength + local cfgName = "unit_talent_"..heroCfgId.."Csv" + local curRank = talent:getv(0, 1) + local curLv = talent:getv(1,1) - 1 + for i, value in ipairs(csvdb[cfgName]) do + if i <= curRank then + for lv, cfg in ipairs(value) do + if i < curRank or lv <= curLv then + if cfg.effect ~= 99 then + if not talentAttrS[cfg.effect] then + talentAttrS[AttsEnumEx[cfg.effect]] = 0 + end + talentAttrS[AttsEnumEx[cfg.effect]] = cfg.strength + end + else + break end end + else + break end end @@ -85,7 +88,7 @@ function HeroPlugin.bind(Hero) for lvl = 1, #faithConfig do if faith >= faithConfig[lvl].exp then local add = faithConfig[lvl]["position_"..unitData.position]:toArray(true, "=") - faithAttr[add[1]] = (faithAttr[add[1]] or 0) + add[2] + faithAttr[AttsEnumEx[add[1]]] = (faithAttr[AttsEnumEx[add[1]]] or 0) + add[2] end end for _, attrName in pairs(AttsEnumEx) do -- libgit2 0.21.2