修改合成增加的概率计算

meta/userapi/lua/ItemSynthesis.lua

@@ -190,57 +190,88 @@ end
 
 -- 消耗增加概率
 function ItemSynthesis.consum_add_rate(actor, consumeItems, special, assistantItem)
-    local configList = ConfigDataManager.getList("cfg_synthesis_material")
+    local confMaterialList = ConfigDataManager.getList("cfg_synthesis_material")
+    local confAssistantList = ConfigDataManager.getList("cfg_synthesis_assistant")
     local allEquip = EquipAndAppear.getLuaItemExtData(actor)
     -- 获取合成增加概率
-    local function _get_item_rate(actor, itemId)
-        for _, v in ipairs(configList) do
-            if v.materialId == itemId then
-                -- 材料
-                if v.type == 0 then
-                    return v.addRateBase or 0
-                end
-                -- 装备
-                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
+    local function _get_item_rate(actor, itemId, groupId)
+        -- 装备强化等级
+        local strengthlv = 0
+        -- 装备追加等级
+        local appendlv = 0
+        local equip = getequipinfo(actor, itemId, 1)
+        if equip and allEquip[itemId] then
+            strengthlv = allEquip[itemId].strengthlv
+            appendlv = allEquip[itemId].appendlv
+        end
+        -- 获取配置
+        local conf = nil
+        if groupId == nil then
+            for _, v in ipairs(confMaterialList) do
+                if v.materialId == itemId then
+                    -- 装备，增加等级判断
+                    if v.type == 2 then
                         -- 是否符合等级要求
                         if v.related == 1 then
                             -- 同时满足强化等级以及追加等级
-                            if strengthlv < v.minLevel or appendlv < v.minAppend then
-                                isMatch = false
+                            if strengthlv >= v.minLevel and appendlv >= v.minAppend then
+                                conf = table.copy(v)
+                                break
                             end
                         end
                         if v.related == 2 then
                             -- 强化等级或追加等级满足其中一个
-                            if strengthlv < v.minLevel and appendlv < v.minAppend then
-                                isMatch = false
+                            if strengthlv >= v.minLevel or appendlv >= v.minAppend then
+                                conf = table.copy(v)
+                                break
                             end
                         end
+                    else
+                        conf = table.copy(v)
+                        break
                     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)
+                end
+            end
+        else
+            for _, v in ipairs(confMaterialList) do
+                if v.groupId == groupId and v.itemId == itemId then
+                    -- 装备，增加等级判断
+                    if v.type == 2 then
+                        -- 是否符合等级要求
                         if v.related == 1 then
-                            addRate = addRate + addStrengthRate + addAppendRate
+                            -- 同时满足强化等级以及追加等级
+                            if strengthlv >= v.minLevel and appendlv >= v.minAppend then
+                                conf = table.copy(v)
+                                break
+                            end
                         end
-
                         if v.related == 2 then
-                            addRate = addRate + math.max(addStrengthRate, addAppendRate)
+                            -- 强化等级或追加等级满足其中一个
+                            if strengthlv >= v.minLevel or appendlv >= v.minAppend then
+                                conf = table.copy(v)
+                                break
+                            end
                         end
-                        return addRate
+                    else
+                        conf = table.copy(v)
+                        break
                     end
                 end
             end
         end
+        if conf then
+            local addRate = conf.addRateBase or 0
+            local addStrengthRate = (strengthlv - (conf.minLevel or 0)) * (conf.perAddRateLevel or 0)
+            local addAppendRate = (appendlv - (conf.minAppend or 0)) * (conf.perAddRateAppend or 0)
+            if conf.related == 1 then
+                addRate = addRate + addStrengthRate + addAppendRate
+            end
+
+            if conf.related == 2 then
+                addRate = addRate + math.max(addStrengthRate, addAppendRate)
+            end
+            return addRate
+        end
         return 0
     end
 
@@ -258,7 +289,8 @@ function ItemSynthesis.consum_add_rate(actor, consumeItems, special, assistantIt
         for index, value in pairs(special) do
             local itemId = value["itemId"]
             local itemIndex = value["itemIndex"]
-            addRate = addRate + _get_item_rate(actor, itemId)
+            local groupId = value["groupId"]
+            addRate = addRate + _get_item_rate(actor, itemId, groupId)
         end
     end
     -- 辅助消耗道具
@@ -266,7 +298,8 @@ function ItemSynthesis.consum_add_rate(actor, consumeItems, special, assistantIt
         for index, value in pairs(assistantItem) do
             local itemId = value["itemId"]
             local itemIndex = value["itemIndex"]
-            addRate = addRate + _get_item_rate(actor, itemId)
+            local groupId = value["groupId"]
+            addRate = addRate + _get_item_rate(actor, itemId, groupId)
         end
     end