修改合成概率

meta/userapi/lua/ItemSynthesis.lua

@@ -64,8 +64,7 @@ function ItemSynthesis.synthesis(actor, msgData)
     local removeItemIndex = {}
     local successRateReal = ConfigDataManager.getTableValue("cfg_synthesis", "successRateReal", "id", synthesisCfgId)
     -- 装备等级概率
-    local addSuccessRateReal =
-        ItemSynthesis.consum_add_rate(actor, synthesisCfgId, splitConsume, special, assistantItem)
+    local addSuccessRateReal = ItemSynthesis.consum_add_rate(actor, splitConsume, special, assistantItem)
     successRateReal = successRateReal + addSuccessRateReal
     -- 最高概率
     local maxRate = tonumber(ConfigDataManager.getTableValue("cfg_synthesis", "maxRate", "id", synthesisCfgId) or 10000)
@@ -190,48 +189,55 @@ function ItemSynthesis.changeItemAtt(actor, itemId, changeItemId)
 end
 
 -- 消耗增加概率
-function ItemSynthesis.consum_add_rate(actor, synthesisCfgId, consumeItems, special, assistantItem)
+function ItemSynthesis.consum_add_rate(actor, consumeItems, special, assistantItem)
     local configList = ConfigDataManager.getList("cfg_synthesis_material")
     local allEquip = EquipAndAppear.getLuaItemExtData(actor)
     -- 获取合成增加概率
-    local function _get_item_rate(actor, sId, itemId)
-        local equip = getequipinfo(actor, itemId, 1)
-        if equip == nil or allEquip[itemId] == nil then
-            return 0
-        end
-
+    local function _get_item_rate(actor, itemId)
         for _, v in ipairs(configList) do
-            if v.synthesisCfgId == sId and v.materialId == itemId then
-                -- 装备强化等级
-                local strengthlv = allEquip[itemId].strengthlv
-                -- 装备追加等级
-                local appendlv = allEquip[itemId].appendlv
-                -- 是否符合等级要求
-                local isMatch = false
-                if v.related == 1 then
-                    -- 同时满足强化等级以及追加等级
-                    if strengthlv >= v.minLevel and appendlv >= v.minAppend then
-                        isMatch = true
-                    end
-                end
-                if v.related == 2 then
-                    -- 强化等级或追加等级满足其中一个
-                    if strengthlv >= v.minLevel or appendlv >= v.minAppend then
-                        isMatch = true
-                    end
+            if v.materialId == itemId then
+                -- 材料
+                if v.type == 0 then
+                    return v.addRateBase or 0
                 end
-                if isMatch then
-                    local addRate = v.addRateBase or 0
-                    local addStrengthRate = (strengthlv - v.minLevel) * (v.perAddRateLevel or 0)
-                    local addAppendRate = (appendlv - v.minAppend) * (v.perAddRateAppend or 0)
-                    if v.related == 1 then
-                        addRate = addRate + addStrengthRate + addAppendRate
+                -- 装备
+                if v.type == 2 then
+                    local isMatch = true
+                    local equip = getequipinfo(actor, itemId, 1)
+                    if equip == nil or allEquip[itemId] == nil then
+                        isMatch = false
+                    else
+                        -- 装备强化等级
+                        local strengthlv = allEquip[itemId].strengthlv
+                        -- 装备追加等级
+                        local appendlv = allEquip[itemId].appendlv
+                        -- 是否符合等级要求
+                        if v.related == 1 then
+                            -- 同时满足强化等级以及追加等级
+                            if strengthlv < v.minLevel or appendlv < v.minAppend then
+                                isMatch = false
+                            end
+                        end
+                        if v.related == 2 then
+                            -- 强化等级或追加等级满足其中一个
+                            if strengthlv < v.minLevel and appendlv < v.minAppend then
+                                isMatch = false
+                            end
+                        end
                     end
+                    if isMatch then
+                        local addRate = v.addRateBase or 0
+                        local addStrengthRate = (strengthlv - v.minLevel) * (v.perAddRateLevel or 0)
+                        local addAppendRate = (appendlv - v.minAppend) * (v.perAddRateAppend or 0)
+                        if v.related == 1 then
+                            addRate = addRate + addStrengthRate + addAppendRate
+                        end
 
-                    if v.related == 2 then
-                        addRate = addRate + math.max(addStrengthRate, addAppendRate)
+                        if v.related == 2 then
+                            addRate = addRate + math.max(addStrengthRate, addAppendRate)
+                        end
+                        return addRate
                     end
-                    return addRate
                 end
             end
         end
@@ -245,14 +251,14 @@ function ItemSynthesis.consum_add_rate(actor, synthesisCfgId, consumeItems, spec
         local consumeItemCfgId = tonumber(consumeInfo[1])
         local consumeItemCount = tonumber(consumeInfo[2])
 
-        addRate = addRate + _get_item_rate(actor, synthesisCfgId, consumeItemCfgId)
+        addRate = addRate + _get_item_rate(actor, consumeItemCfgId)
     end
     -- 公式特殊消耗道具
     if special then
         for index, value in pairs(special) do
             local itemId = value["itemId"]
             local itemIndex = value["itemIndex"]
-            addRate = addRate + _get_item_rate(actor, synthesisCfgId, itemId)
+            addRate = addRate + _get_item_rate(actor, itemId)
         end
     end
     -- 辅助消耗道具
@@ -260,7 +266,7 @@ function ItemSynthesis.consum_add_rate(actor, synthesisCfgId, consumeItems, spec
         for index, value in pairs(assistantItem) do
             local itemId = value["itemId"]
             local itemIndex = value["itemIndex"]
-            addRate = addRate + _get_item_rate(actor, synthesisCfgId, itemId)
+            addRate = addRate + _get_item_rate(actor, itemId)
         end
     end