dd

2025-09-20 09:49:22 +08:00
parent 3435f76f5d
commit 577f43042b
5 changed files with 352 additions and 1422 deletions
--- a/build-templates/wechatgame/cloud_functions/cocos_cloud/modules/inventory.js
+++ b/build-templates/wechatgame/cloud_functions/cocos_cloud/modules/inventory.js
@@ -1,8 +1,7 @@
 // 通用库存操作模块 (items, tals, equips)
-// 现在作为统一接口，调用各个独立模块
-const itemsModule = require('./items');
-const talsModule = require('./tals');
-const equipsModule = require('./equips');
+const { getOrCreaterUser } = require('./auth');
+
+const user_db_name = "cocos_users";

 // 支持的数据类型
 const SUPPORTED_TYPES = ['items', 'tals', 'equips'];
@@ -16,24 +15,6 @@ function validateDataType(dataType) {
  return SUPPORTED_TYPES.includes(dataType);
 }

-/**
- * 根据数据类型获取对应的模块
- * @param {string} dataType 数据类型
- * @returns {Object} 对应的模块
- */
-function getModuleByType(dataType) {
-  switch(dataType) {
-    case 'items':
-      return itemsModule;
-    case 'tals':
-      return talsModule;
-    case 'equips':
-      return equipsModule;
-    default:
-      return null;
-  }
-}
-
 /**
 * 获取库存数据
 * @param {Object} db 数据库实例
@@ -42,26 +23,33 @@ function getModuleByType(dataType) {
 * @returns {Object} 操作结果
 */
 async function getInventory(db, openid, dataType) {
-  if (!validateDataType(dataType)) {
-    return {
-      code: -3,
-      msg: `无效的数据类型: ${dataType}`
-    };
-  }
-  
-  const module = getModuleByType(dataType);
-  switch(dataType) {
-    case 'items':
-      return await module.getItems(db, openid);
-    case 'tals':
-      return await module.getTals(db, openid);
-    case 'equips':
-      return await module.getEquips(db, openid);
-    default:
+  try {
+    if (!validateDataType(dataType)) {
      return {
        code: -3,
        msg: `无效的数据类型: ${dataType}`
      };
+    }
+    
+    let user = await getOrCreaterUser(db, openid);
+    if (!user) {
+      return {
+        code: -4,
+        msg: "未找到用户"
+      };
+    }
+    
+    return {
+      code: 200,
+      data: user[dataType],
+      msg: `${dataType}获取成功`
+    };
+  } catch (error) {
+    console.error(`获取${dataType}错误:`, error);
+    return {
+      code: -5,
+      msg: `获取${dataType}错误: ${error.message}`
+    };
  }
 }

@@ -74,26 +62,44 @@ async function getInventory(db, openid, dataType) {
 * @returns {Object} 操作结果
 */
 async function getInventoryItem(db, openid, dataType, itemId) {
-  if (!validateDataType(dataType)) {
-    return {
-      code: -3,
-      msg: `无效的数据类型: ${dataType}`
-    };
-  }
-  
-  const module = getModuleByType(dataType);
-  switch(dataType) {
-    case 'items':
-      return await module.getItem(db, openid, itemId);
-    case 'tals':
-      return await module.getTal(db, openid, itemId);
-    case 'equips':
-      return await module.getEquip(db, openid, itemId);
-    default:
+  try {
+    if (!validateDataType(dataType)) {
      return {
        code: -3,
        msg: `无效的数据类型: ${dataType}`
      };
+    }
+    
+    let user = await getOrCreaterUser(db, openid);
+    if (!user) {
+      return {
+        code: -4,
+        msg: "未找到用户"
+      };
+    }
+    
+    const itemCount = user[dataType][itemId];
+    if (itemCount === undefined) {
+      return {
+        code: -6,
+        msg: `${dataType.slice(0, -1)} ${itemId} 未找到`
+      };
+    }
+    
+    return {
+      code: 200,
+      data: {
+        item_id: itemId,
+        count: itemCount
+      },
+      msg: `${dataType.slice(0, -1)} ${itemId} 获取成功`
+    };
+  } catch (error) {
+    console.error(`获取${dataType}物品错误:`, error);
+    return {
+      code: -5,
+      msg: `获取${dataType}物品错误: ${error.message}`
+    };
  }
 }

@@ -107,26 +113,63 @@ async function getInventoryItem(db, openid, dataType, itemId) {
 * @returns {Object} 操作结果
 */
 async function addInventoryItem(db, openid, dataType, itemId, count) {
-  if (!validateDataType(dataType)) {
-    return {
-      code: -3,
-      msg: `无效的数据类型: ${dataType}`
-    };
-  }
-  
-  const module = getModuleByType(dataType);
-  switch(dataType) {
-    case 'items':
-      return await module.addItem(db, openid, itemId, count);
-    case 'tals':
-      return await module.addTal(db, openid, itemId, count);
-    case 'equips':
-      return await module.addEquip(db, openid, itemId, count);
-    default:
+  try {
+    if (!validateDataType(dataType)) {
      return {
        code: -3,
        msg: `无效的数据类型: ${dataType}`
      };
+    }
+    
+    const _ = db.command;
+    let user = await getOrCreaterUser(db, openid);
+    if (!user) {
+      return {
+        code: -4,
+        msg: "未找到用户"
+      };
+    }
+    
+    if (typeof count !== 'number' || count < 0) {
+      return {
+        code: -3,
+        msg: "数量必须是非负数"
+      };
+    }
+    
+    const currentCount = user[dataType][itemId] || 0;
+    const newCount = currentCount + count;
+    
+    let updateRes = await db.collection(user_db_name).doc(user._id).update({
+      data: {
+        [`${dataType}.${itemId}`]: _.set(newCount),
+        last_save_time: _.set(Date.now())
+      }
+    });
+
+    if (updateRes?.stats?.updated >= 1) {
+      return {
+        code: 200,
+        data: {
+          item_id: itemId,
+          old_count: currentCount,
+          new_count: newCount,
+          added: count
+        },
+        msg: `${dataType.slice(0, -1)} ${itemId} 添加成功`
+      };
+    } else {
+      return {
+        code: -1,
+        msg: `添加 ${dataType.slice(0, -1)} 失败`
+      };
+    }
+  } catch (error) {
+    console.error(`添加${dataType}物品错误:`, error);
+    return {
+      code: -5,
+      msg: `添加${dataType}物品错误: ${error.message}`
+    };
  }
 }

@@ -140,26 +183,44 @@ async function addInventoryItem(db, openid, dataType, itemId, count) {
 * @returns {Object} 操作结果
 */
 async function consumeInventoryItem(db, openid, dataType, itemId, count) {
-  if (!validateDataType(dataType)) {
-    return {
-      code: -3,
-      msg: `无效的数据类型: ${dataType}`
-    };
-  }
-  
-  const module = getModuleByType(dataType);
-  switch(dataType) {
-    case 'items':
-      return await module.consumeItem(db, openid, itemId, count);
-    case 'tals':
-      return await module.consumeTal(db, openid, itemId, count);
-    case 'equips':
-      return await module.consumeEquip(db, openid, itemId, count);
-    default:
+  try {
+    if (!validateDataType(dataType)) {
      return {
        code: -3,
        msg: `无效的数据类型: ${dataType}`
      };
+    }
+    
+    let user = await getOrCreaterUser(db, openid);
+    if (!user) {
+      return {
+        code: -4,
+        msg: "未找到用户"
+      };
+    }
+    
+    if (typeof count !== 'number' || count < 0) {
+      return {
+        code: -3,
+        msg: "数量必须是非负数"
+      };
+    }
+    
+    const currentCount = user[dataType][itemId] || 0;
+    if (currentCount < count) {
+      return {
+        code: -6,
+        msg: `${dataType.slice(0, -1)} ${itemId}不足, 当前: ${currentCount}, 需要: ${count}`
+      };
+    }
+    
+    return await addInventoryItem(db, openid, dataType, itemId, -count);
+  } catch (error) {
+    console.error(`消耗${dataType}物品错误:`, error);
+    return {
+      code: -5,
+      msg: `消耗${dataType}物品错误: ${error.message}`
+    };
  }
 }

@@ -173,26 +234,61 @@ async function consumeInventoryItem(db, openid, dataType, itemId, count) {
 * @returns {Object} 操作结果
 */
 async function setInventoryItem(db, openid, dataType, itemId, count) {
-  if (!validateDataType(dataType)) {
-    return {
-      code: -3,
-      msg: `无效的数据类型: ${dataType}`
-    };
-  }
-  
-  const module = getModuleByType(dataType);
-  switch(dataType) {
-    case 'items':
-      return await module.setItem(db, openid, itemId, count);
-    case 'tals':
-      return await module.setTal(db, openid, itemId, count);
-    case 'equips':
-      return await module.setEquip(db, openid, itemId, count);
-    default:
+  try {
+    if (!validateDataType(dataType)) {
      return {
        code: -3,
        msg: `无效的数据类型: ${dataType}`
      };
+    }
+    
+    const _ = db.command;
+    let user = await getOrCreaterUser(db, openid);
+    if (!user) {
+      return {
+        code: -4,
+        msg: "未找到用户"
+      };
+    }
+    
+    if (typeof count !== 'number' || count < 0) {
+      return {
+        code: -3,
+        msg: "数量必须是非负数"
+      };
+    }
+    
+    const oldCount = user[dataType][itemId] || 0;
+    
+    let updateRes = await db.collection(user_db_name).doc(user._id).update({
+      data: {
+        [`${dataType}.${itemId}`]: _.set(count),
+        last_save_time: _.set(Date.now())
+      }
+    });
+
+    if (updateRes?.stats?.updated >= 1) {
+      return {
+        code: 200,
+        data: {
+          item_id: itemId,
+          old_count: oldCount,
+          new_count: count
+        },
+        msg: `${dataType.slice(0, -1)} ${itemId} 设置成功`
+      };
+    } else {
+      return {
+        code: -1,
+        msg: `设置 ${dataType.slice(0, -1)} 失败`
+      };
+    }
+  } catch (error) {
+    console.error(`设置${dataType}物品错误:`, error);
+    return {
+      code: -5,
+      msg: `设置${dataType}物品错误: ${error.message}`
+    };
  }
 }

@@ -206,26 +302,76 @@ async function setInventoryItem(db, openid, dataType, itemId, count) {
 * @returns {Object} 操作结果
 */
 async function updateInventory(db, openid, dataType, updateData, merge = true) {
-  if (!validateDataType(dataType)) {
-    return {
-      code: -3,
-      msg: `无效的数据类型: ${dataType}`
-    };
-  }
-  
-  const module = getModuleByType(dataType);
-  switch(dataType) {
-    case 'items':
-      return await module.updateItems(db, openid, updateData, merge);
-    case 'tals':
-      return await module.updateTals(db, openid, updateData, merge);
-    case 'equips':
-      return await module.updateEquips(db, openid, updateData, merge);
-    default:
+  try {
+    if (!validateDataType(dataType)) {
      return {
        code: -3,
-        msg: `无效的数据类型: ${dataType}`
+        msg: `Invalid data type: ${dataType}`
      };
+    }
+    
+    const _ = db.command;
+    let user = await getOrCreaterUser(db, openid);
+    if (!user) {
+      return {
+        code: -4,
+        msg: "User not found"
+      };
+    }
+    
+    // 验证更新数据
+    if (!updateData || typeof updateData !== 'object') {
+      return {
+        code: -3,
+        msg: "Invalid update data format"
+      };
+    }
+    
+    // 验证所有值都是非负数
+    for (const itemId in updateData) {
+      const count = updateData[itemId];
+      if (typeof count !== 'number' || count < 0) {
+        return {
+          code: -3,
+          msg: `Invalid count for item ${itemId}: ${count}`
+        };
+      }
+    }
+    
+    let newData;
+    if (merge) {
+      // 合并更新
+      newData = { ...user[dataType], ...updateData };
+    } else {
+      // 完全替换
+      newData = updateData;
+    }
+    
+    let updateRes = await db.collection(user_db_name).doc(user._id).update({
+      data: {
+        [dataType]: _.set(newData),
+        last_save_time: _.set(Date.now())
+      }
+    });
+
+    if (updateRes?.stats?.updated >= 1) {
+      return {
+        code: 200,
+        data: newData,
+        msg: `${dataType} updated successfully`
+      };
+    } else {
+      return {
+        code: -1,
+        msg: `Update ${dataType} fail`
+      };
+    }
+  } catch (error) {
+    console.error(`Update ${dataType} error:`, error);
+    return {
+      code: -5,
+      msg: `Update ${dataType} error: ${error.message}`
+    };
  }
 }

@@ -237,26 +383,52 @@ async function updateInventory(db, openid, dataType, updateData, merge = true) {
 * @returns {Object} 操作结果
 */
 async function resetInventory(db, openid, dataType) {
-  if (!validateDataType(dataType)) {
-    return {
-      code: -3,
-      msg: `无效的数据类型: ${dataType}`
-    };
-  }
-  
-  const module = getModuleByType(dataType);
-  switch(dataType) {
-    case 'items':
-      return await module.resetItems(db, openid);
-    case 'tals':
-      return await module.resetTals(db, openid);
-    case 'equips':
-      return await module.resetEquips(db, openid);
-    default:
+  try {
+    if (!validateDataType(dataType)) {
      return {
        code: -3,
-        msg: `无效的数据类型: ${dataType}`
+        msg: `Invalid data type: ${dataType}`
      };
+    }
+    
+    const _ = db.command;
+    const { getNewUserInitData } = require('../user_init_data');
+    let user = await getOrCreaterUser(db, openid);
+    if (!user) {
+      return {
+        code: -4,
+        msg: "User not found"
+      };
+    }
+    
+    const defaultData = getNewUserInitData();
+    
+    let resetRes = await db.collection(user_db_name).doc(user._id).update({
+      data: {
+        [dataType]: _.set(defaultData[dataType]),
+        last_save_time: _.set(Date.now()),
+        reset_time: _.set(Date.now())
+      }
+    });
+
+    if (resetRes?.stats?.updated >= 1) {
+      return {
+        code: 200,
+        data: defaultData[dataType],
+        msg: `${dataType} reset successfully`
+      };
+    } else {
+      return {
+        code: -1,
+        msg: `Reset ${dataType} fail`
+      };
+    }
+  } catch (error) {
+    console.error(`Reset ${dataType} error:`, error);
+    return {
+      code: -5,
+      msg: `Reset ${dataType} error: ${error.message}`
+    };
  }
 }

@@ -268,26 +440,47 @@ async function resetInventory(db, openid, dataType) {
 * @returns {Object} 操作结果
 */
 async function getOwnedItems(db, openid, dataType) {
-  if (!validateDataType(dataType)) {
-    return {
-      code: -3,
-      msg: `无效的数据类型: ${dataType}`
-    };
-  }
-  
-  const module = getModuleByType(dataType);
-  switch(dataType) {
-    case 'items':
-      return await module.getOwnedItems(db, openid);
-    case 'tals':
-      return await module.getOwnedTals(db, openid);
-    case 'equips':
-      return await module.getOwnedEquips(db, openid);
-    default:
+  try {
+    if (!validateDataType(dataType)) {
      return {
        code: -3,
-        msg: `无效的数据类型: ${dataType}`
+        msg: `Invalid data type: ${dataType}`
      };
+    }
+    
+    let user = await getOrCreaterUser(db, openid);
+    if (!user) {
+      return {
+        code: -4,
+        msg: "User not found"
+      };
+    }
+    
+    const ownedItems = [];
+    for (const itemId in user[dataType]) {
+      const count = user[dataType][itemId];
+      if (count > 0) {
+        ownedItems.push({
+          item_id: parseInt(itemId),
+          count: count
+        });
+      }
+    }
+    
+    return {
+      code: 200,
+      data: {
+        owned_items: ownedItems,
+        total_types: ownedItems.length
+      },
+      msg: `Owned ${dataType} retrieved successfully`
+    };
+  } catch (error) {
+    console.error(`Get owned ${dataType} error:`, error);
+    return {
+      code: -5,
+      msg: `Get owned ${dataType} error: ${error.message}`
+    };
  }
 }