结算获取消耗品和金币

shared/consts/consts.ts

@@ -27,11 +27,60 @@ export const BATTLE_REWARD_TYPE = {
 
 export const GOOD_TYPE = {
   EQUIP: 1,
-  ITEM: 2,
-  SCRIPT_ITEM: 3,
-  HERO_SOUL: 4
+  CONSUMES: 2,
+  SCRIPT: 3
 };
 
+const itid_array = [
+  { id: 1, name: '剑', goodType: GOOD_TYPE.EQUIP },
+  { id: 2, name: '枪', goodType: GOOD_TYPE.EQUIP },
+  { id: 3, name: '刀', goodType: GOOD_TYPE.EQUIP },
+  { id: 4, name: '弓', goodType: GOOD_TYPE.EQUIP },
+  { id: 5, name: '拳', goodType: GOOD_TYPE.EQUIP },
+  { id: 6, name: '扇', goodType: GOOD_TYPE.EQUIP },
+  { id: 7, name: '宝剑', goodType: GOOD_TYPE.EQUIP },
+  { id: 8, name: '权杖', goodType: GOOD_TYPE.EQUIP },
+  { id: 9, name: '头盔', goodType: GOOD_TYPE.EQUIP },
+  { id: 10, name: '帽子', goodType: GOOD_TYPE.EQUIP },
+  { id: 11, name: '头巾', goodType: GOOD_TYPE.EQUIP },
+  { id: 12, name: '铠甲（衣）', goodType: GOOD_TYPE.EQUIP },
+  { id: 13, name: '战袍（衣）', goodType: GOOD_TYPE.EQUIP },
+  { id: 14, name: '法衣（衣）', goodType: GOOD_TYPE.EQUIP },
+  { id: 15, name: '铠甲（裤）', goodType: GOOD_TYPE.EQUIP },
+  { id: 16, name: '战袍（裤）', goodType: GOOD_TYPE.EQUIP },
+  { id: 17, name: '法衣（裤）', goodType: GOOD_TYPE.EQUIP },
+  { id: 18, name: '重靴', goodType: GOOD_TYPE.EQUIP },
+  { id: 19, name: '战靴', goodType: GOOD_TYPE.EQUIP },
+  { id: 20, name: '布鞋', goodType: GOOD_TYPE.EQUIP },
+  { id: 21, name: '饰品', goodType: GOOD_TYPE.EQUIP },
+  { id: 22, name: '消耗类物品（图纸类）', goodType: GOOD_TYPE.CONSUMES, field: "consumeGoods" },
+  { id: 23, name: '消耗类物品（材料类）', goodType: GOOD_TYPE.CONSUMES, field: "consumeGoods" },
+  { id: 24, name: '消耗类物品（宝箱类）', goodType: GOOD_TYPE.CONSUMES, field: "consumeGoods" },
+  { id: 26, name: '武将碎片', goodType: GOOD_TYPE.CONSUMES, field: "souls" },
+  { id: 27, name: '货币', goodType: GOOD_TYPE.CONSUMES, field: "currency", isCurrency: true }
+];
+
+export const ITID = new Map<number, {id: number, name: string, goodType: number, field?: string, isCurrency?: boolean}>();
+for(let obj of itid_array) {
+  ITID.set(obj.id, obj);
+}
+
+export const CURRENCY_TYPE = {
+  GOLD: "gold",
+  COIN: "coin",
+  ACTION_POINT: "ap"
+}
+
+const currencyArr = [
+  { "gid": 31001, "name": "铜钱", "type": CURRENCY_TYPE.COIN },
+  { "gid": 31002, "name": "元宝", "type": CURRENCY_TYPE.GOLD },
+  { "gid": 31003, "name": "体力", "type": CURRENCY_TYPE.ACTION_POINT },
+];
+export const CURRENCY = new Map<number, {gid: number, name: string, type: string}>();
+for(let obj of currencyArr) {
+  CURRENCY.set(obj.gid, obj);
+}
+
 export const WAR_TYPE = {
   NORMAL: 1,
   DAILY: 2,

shared/db/Role.ts

@@ -59,6 +59,9 @@ export default class Role extends BaseModel {
     cnt: number;					// 购买次数
   }];
 
+  @prop({ required: true, default: 0 })
+  coin: number;						// 总铜钱
+
   @prop({ required: true, default: [] })
   consumeGoods: [{				// 消耗品
     id: number;						// id
@@ -181,6 +184,33 @@ export default class Role extends BaseModel {
     let result = await RoleModel.deleteMany({roleId}).lean(lean);
     return result||{};
   }
+
+
+  public static async addItems(roleId: string, field: string, id: number, cnt: number, lean = true) {
+
+    let addToSet = {};
+    addToSet[field] = {id, cnt: 0};
+    await RoleModel.findOneAndUpdate({roleId}, { $addToSet: addToSet }, { "new": true, "upsert": true});
+
+    let condition = { roleId };
+    condition[`${field}.id`] = id;
+    let update = {};
+    update[`${field}.$.cnt`] = cnt;
+
+    console.log(JSON.stringify(condition), update)
+    let result = await RoleModel.findOneAndUpdate(condition, { $inc: update }, { "new": true, "upsert": true}).lean(lean);
+    return result;
+  }
+
+  public static async addCoin(roleId: string, cnt: number, lean = true) {
+    let result = await RoleModel.findOneAndUpdate({roleId}, { $inc: {coin: cnt} }, { "new": true, "upsert": true}).lean(lean);
+    return result;
+  }
+
+  public static async addGoldFree(roleId: string, cnt: number, lean = true) {
+    let result = await RoleModel.findOneAndUpdate({roleId}, { $inc: { gold: cnt, giftGold: cnt } }, { "new": true, "upsert": true}).lean(lean);
+    return result;
+  }
 }
 
 export const RoleModel = getModelForClass(Role);