修改物品消耗，绑金不足，由金币补充

dev/data/bag.lua

@@ -95,6 +95,7 @@ end
 -- 判断资源是否足够
 function root:is_enough(uid, items)
     -- 求和
+    local isExchangeDiamond = false
     local tempMap = {}
     for _, v in ipairs(items) do
         if not tempMap[v.id] then
@@ -102,6 +103,9 @@ function root:is_enough(uid, items)
         else
             tempMap[v.id] = tempMap[v.id] + v.count
         end
+        if v.id == gameConst.ITEM_ID.DIAMOND then
+            isExchangeDiamond = true
+        end
     end
 
     local itemList = moduleData:hget_json(uid, MODULE_NAME, "itemList") or {}
@@ -114,6 +118,39 @@ function root:is_enough(uid, items)
             break
         end
     end
+    -- 转换绑金
+    if ret == false and isExchangeDiamond then
+        local item = table.key_find(itemList, "id", gameConst.ITEM_ID.DIAMOND)
+        local addGold = tempMap[gameConst.ITEM_ID.DIAMOND]
+        if item and not is_empty(item.count) then
+            addGold = addGold - item.count
+        end
+        -- 增加金币消耗
+        if addGold >= 0 then
+            tempMap[gameConst.ITEM_ID.GOLD] = (tempMap[gameConst.ITEM_ID.GOLD] or 0) + addGold
+
+            ret = true
+            -- 重新检查是否充足
+            for k, v in pairs(tempMap) do
+                local _item = table.key_find(itemList, "id", k)
+                if not _item or not _item.count or _item.count < v then
+                    ret = false
+                    break
+                end
+            end
+        end
+        if ret == true then
+            -- 修改消耗物品列表
+            local costItems = {}
+            for k, v in pairs(tempMap) do
+                table.insert(costItems, {id = k, count = v})
+            end
+            return true, costItems
+        end
+    end
+    if ret == true then
+        return true, items
+    end
 
     return ret
 end

dev/modules/bag.lua

@@ -1,3 +1,14 @@
+--[[
+Descripttion:背包
+version:
+Author: Neo,Huang
+Date: 2023-11-15 22:34:35
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-15 23:54:11
+--]]
+local code = require("code")
+local resAdapt = require("adapt.resAdapt")
+
 local bagData = require("data.bag")
 local gameConst = require("const.gameConst")
 

dev/modules/pay.lua

@@ -1,11 +1,14 @@
 --[[
-Descripttion:支付订单模块
+Descripttion:支付统计
 version:
 Author: Neo,Huang
-Date: 2022-08-17 16:04:20
+Date: 2023-11-15 22:34:35
 LastEditors: Neo,Huang
-LastEditTime: 2022-09-05 10:05:30
+LastEditTime: 2023-11-15 23:57:03
 --]]
+local code = require("code")
+local gameConst = require("const.gameConst")
+local util_user = require("utils.util_user")
 local shopAdapt = require("adapt.shopAdapt")
 
 local payData = require("data.pay")

dev/modules/pmail.lua

@@ -39,7 +39,7 @@ function root:add_read_mail(id)
 	if table.include(readIdList, id) then
 		return false
 	end
-	table.insetr(readIdList, id)
+	table.insert(readIdList, id)
 	self:redis_update_key_info("readIdList", readIdList)
 end
 -- 是否已读
@@ -63,7 +63,7 @@ function root:add_del_mail(id)
 	if table.include(delIdList, id) then
 		return false
 	end
-	table.insetr(delIdList, id)
+	table.insert(delIdList, id)
 	self:redis_update_key_info("delIdList", delIdList)
 end
 -- 是否已读
@@ -87,7 +87,7 @@ function root:add_award_mail(id)
 	if table.include(awardIdList, id) then
 		return false
 	end
-	table.insetr(awardIdList, id)
+	table.insert(awardIdList, id)
 	self:redis_update_key_info("awardIdList", awardIdList)
 	return true
 end

dev/modules/sharecode.lua

@@ -1,4 +1,11 @@
+--[[
+Descripttion:邀请码
+version:
+Author: Neo,Huang
+Date: 2023-11-15 22:34:35
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-15 23:58:55
+--]]
 local root = class("sharecode", require("base.baseModule"))
 
 function root:ctor(sharecode)

dev/utils/util_box.lua

@@ -1,12 +1,11 @@
 --[[
-Descripttion:玩家事件
+Descripttion:开箱子
 version:
 Author: Neo,Huang
-Date: 2022-07-05 19:59:16
+Date: 2023-11-15 22:34:35
 LastEditors: Neo,Huang
-LastEditTime: 2022-07-05 20:08:31
+LastEditTime: 2023-11-15 22:41:18
 --]]
-local lib_game_redis = require("lib_game_redis")
 local timeUtil = require("utils.timeUtil")
 local redisUtil = require("utils.redisUtil")
 local util_player = require("utils.util_player")

nodes/game/interface/box.lua

@@ -1,10 +1,10 @@
 --[[
-Descripttion:接口 - 开箱子
+Descripttion:开箱子
 version:
 Author: Neo,Huang
-Date: 2022-07-05 17:32:01
+Date: 2023-11-15 22:34:35
 LastEditors: Neo,Huang
-LastEditTime: 2022-07-05 20:29:29
+LastEditTime: 2023-11-15 22:42:18
 --]]
 local code = require("code")
 local util_box = require("utils.util_box")
@@ -38,21 +38,17 @@ function root:box_blind_open(role, msg)
     local items = nil
     for i = 1, count do
         -- 掉落物品
-        local itemId, count = util_box:get_box_drop_item_and_count(id)
-        if not is_empty(itemId) and not is_empty(count) then
-            local costItems = {{id = gameConst.ITEM_ID.DIAMOND, count = conf.diamondPrice}}
-            if not bagData:is_enough(uid, costItems) then
-                -- 绑金不足，使用金币
-                costItems = {{id = gameConst.ITEM_ID.GOLD, count = conf.goldPrice}}
-                if not bagData:is_enough(uid, costItems) then
-                    break
-                end
+        local itemId, itemCount = util_box:get_box_drop_item_and_count(id)
+        if not is_empty(itemId) and not is_empty(itemCount) then
+            local ok, costItems = bagData:is_enough(uid, {{id = gameConst.ITEM_ID.DIAMOND, count = conf.price}})
+            if not ok then
+                break
             end
             -- 消耗
             local eventId = string.format("box-blind-%s", tostring(id))
             bagData:consume_items(uid, costItems, eventId)
             -- 获取物品
-            local _items = {{id = itemId, count = count}}
+            local _items = {{id = itemId, count = itemCount}}
             bagData:add_items(uid, _items, eventId)
 
             items = itemUtil.items_merge(items, _items)