军团：炼器堂

2022-02-18 16:41:43 +08:00
parent 2773d1d9db
commit e29326856c
14 changed files with 255 additions and 319 deletions
--- a/game-server/app/servers/guild/handler/guildRefineHandler.ts
+++ b/game-server/app/servers/guild/handler/guildRefineHandler.ts
@@ -3,7 +3,7 @@ import { UserGuildModel } from '../../../db/UserGuild';
 import { resResult } from '../../../pubUtils/util';
 import { STATUS, GUILD_OPERATE, TASK_TYPE, ITEM_CHANGE_REASON, ITID, CONSUME_TYPE } from '../../../consts';
 import { GuildRefineModel } from '../../../db/GuildRefine';
-import { getArmyDevelopConsumeById, getGoodById } from '../../../pubUtils/data';
+import { gameData, getArmyDevelopConsumeById, getGoodById } from '../../../pubUtils/data';
 import { nowSeconds } from '../../../pubUtils/timeUtil';
 import { handleCost, addItems, checkGoods } from '../../../services/rewardService';
 import { GuildModel } from '../../../db/Guild';
@@ -11,10 +11,11 @@ import { findIndex, findWhere } from 'underscore';
 import { lockData } from '../../../services/redLockService';
 import { ARMY } from '../../../pubUtils/dicParam';
 import { CURRENCY_BY_TYPE, CURRENCY_TYPE } from '../../../consts/constModules/itemConst';
-import { openGuildRefine } from '../../../services/guildRefineService';
+import { checkEquipProduceStructureLv, openGuildRefine, refreshRefinCnt } from '../../../services/guildRefineService';
 import { DATA_NAME } from '../../../consts/dataName';
 import { checkTask } from '../../../services/taskService';
 import { guildInter } from '../../../pubUtils/interface';
+import { DicArmyDevelopConsume } from '../../../pubUtils/dictionary/DicArmyDevelopConsume';

 export default function (app: Application) {
    new HandlerService(app, {});
@@ -37,46 +38,65 @@ export class GuildRefineHandler {
        if (!guildRefine) {
            guildRefine = await openGuildRefine(code);
        }
-        return resResult(STATUS.SUCCESS, { scienceTrees: guildRefine.scienceTrees });
+        let { refineCnt } = refreshRefinCnt(userGuild);
+        return resResult(STATUS.SUCCESS, { scienceTrees: guildRefine.scienceTrees, refineCnt });
    }
    /**
     * 炼器
     * @param msg 
     * @param session 
     */
-    async refineEquip(msg: guildInter & { pid: number }, session: BackendSession) {
-        let { pid, myUserGuild: userGuild } = msg;
+    async refine(msg: guildInter & { id: number, count: number }, session: BackendSession) {
+        let { id, count, myUserGuild: userGuild } = msg;
        const roleId: string = session.get('roleId');
        const sid: string = session.get('sid');
        const roleName: string = session.get('roleName');
        
-        let pieceInfo = getGoodById(pid);
+        let dicGoods = gameData.goods.get(id);
+        if(!dicGoods) return resResult(STATUS.DIC_DATA_NOT_FOUND);
+        let dicItid = ITID.get(dicGoods.itid);
+        console.log('####', dicItid.type, CONSUME_TYPE.DRAWING)
+        if(!dicItid || dicItid.type != CONSUME_TYPE.DRAWING) return resResult(STATUS.GUILD_CANNOT_REFINE_THIS);
+
        let { guildCode: code } = userGuild;

-        let { scienceTrees } = await GuildRefineModel.getRefine(code);
-        let findDevelopConsume;
-        //判断是否可以炼该兵器
-        for (let scienceTree of scienceTrees) {
-            if (scienceTree.endTime < nowSeconds()) {
-                let developConsume = getArmyDevelopConsumeById(scienceTree.id);
-                let dicItid = ITID.get(pieceInfo.itid);
-                if (developConsume.quality >= pieceInfo.quality && (dicItid.type != CONSUME_TYPE.PIECE || (dicItid.type == CONSUME_TYPE.PIECE && pieceInfo.equipLvl >= developConsume.starLevel))) {
-                    findDevelopConsume = developConsume;
-                    break;
-                }
+        let guildRefine = await GuildRefineModel.getRefine(code);
+        if(!guildRefine) return resResult(STATUS.GUILD_PERSITION_TREE_NOT_LIGHT);

+        let { scienceTrees } = guildRefine;
+        let dicDevelopConsume: DicArmyDevelopConsume;
+        for(let scienceTree of scienceTrees) {
+            console.log('####', scienceTree.endTime)
+            if(scienceTree.endTime && scienceTree.endTime >= nowSeconds()) continue; // 没有炼完
+            let _dicDevelopConsume = getArmyDevelopConsumeById(scienceTree.id);
+            console.log('####', _dicDevelopConsume.quality, dicGoods.quality)
+            if(_dicDevelopConsume.quality != dicGoods.quality) continue; // 品质错误
+            if(!dicDevelopConsume || dicDevelopConsume.qualityLevel < _dicDevelopConsume.qualityLevel) { // 选择等级最高的
+                dicDevelopConsume = _dicDevelopConsume;
            }
        }
-        if (!findDevelopConsume)
-            return resResult(STATUS.GUILD_NOT_REFINE_THE_EQUIP);
-        let result = await handleCost(roleId, sid, findDevelopConsume.honourConsume, ITEM_CHANGE_REASON.REFINE_EQUIP);
+        if(!dicDevelopConsume) return resResult(STATUS.GUILD_CANNOT_REFINE_THIS);
+
+        let result = await handleCost(roleId, sid, dicDevelopConsume.honourConsume, ITEM_CHANGE_REASON.REFINE_EQUIP);
        if (!result)
            return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
-        let goods = await addItems(roleId, roleName, sid, [{ id: pid, count: 1 }], ITEM_CHANGE_REASON.REFINE_EQUIP);
+
+        let { refineCnt, refRefineTime } = refreshRefinCnt(userGuild);
+        let curQualityCnt = refineCnt.find(cur => cur.quality == dicGoods.quality);
+        let myCnt = curQualityCnt?.count||0;
+        if(myCnt + count > dicDevelopConsume.max) return resResult(STATUS.GUILD_REFINE_CNT_MAX);
+        if(!curQualityCnt) {
+            refineCnt.push({ quality: dicGoods.quality, count });
+        } else {
+            curQualityCnt.count += count;
+        }
+        await UserGuildModel.updateInfo(roleId, { refineCnt, refRefineTime }, {});
+
+        let goods = await addItems(roleId, roleName, sid, [{ id, count }], ITEM_CHANGE_REASON.REFINE_EQUIP);

        // 任务
-        await checkTask(roleId, sid, TASK_TYPE.GUILD_REFINE, 1, true, { quality: pieceInfo.lvLimited });
-        return resResult(STATUS.SUCCESS, { goods });
+        await checkTask(roleId, sid, TASK_TYPE.GUILD_REFINE, 1, true, { quality: dicGoods.quality });
+        return resResult(STATUS.SUCCESS, { goods, refineCnt });
    }
    /**
     * 点亮科技树
@@ -89,14 +109,21 @@ export class GuildRefineHandler {
        const { myUserGuild: userGuild } = msg

        const { guildCode: code } = userGuild;
-        let developConsume = getArmyDevelopConsumeById(id);
-        if (!developConsume)
-            return resResult(STATUS.WRONG_PARMS);
+        let { structure } = await GuildModel.findByCode(code, serverId);
+        let dicDevelopConsume = getArmyDevelopConsumeById(id);
+        if (!dicDevelopConsume) return resResult(STATUS.WRONG_PARMS);
+
        let res: any = await lockData(serverId, DATA_NAME.GUILD_REFINE, code);//加锁
-        if (!!res.err)
-            return resResult(STATUS.REDLOCK_ERR);
+        if (!!res.err) return resResult(STATUS.REDLOCK_ERR);
+
+        if(!checkEquipProduceStructureLv(structure, id)) {
+            res.releaseCallback();
+            return resResult(STATUS.GUILD_EQUIP_PRODUCE_LV_NOT_ENOUGH);
+        }
+
        let guildRefine = await GuildRefineModel.getRefine(code);
        let nowTime = nowSeconds();
+
        for (let scienceTree of guildRefine.scienceTrees) {
            if (scienceTree.id == id) {//检查是否点亮过
                res.releaseCallback();
@@ -109,20 +136,20 @@ export class GuildRefineHandler {
            }
        }

-        for (let prePosition of developConsume.prePositions) {
-            let scienceTree = findWhere(guildRefine.scienceTrees, { id: prePosition });
-            if (!scienceTree || scienceTree.endTime > nowTime) {
+        for (let prePosition of dicDevelopConsume.prePositions) {
+            let preScieceTree = guildRefine.scienceTrees.find(cur => cur.id == prePosition);
+            if (!preScieceTree || preScieceTree.endTime > nowTime) {
                res.releaseCallback();
                return resResult(STATUS.GUILD_PERSITION_TREE_NOT_LIGHT);//前置科技树未点亮
            }
        }
        //点亮消耗
-        const costResult = await GuildModel.costFund(code, developConsume.fundConsume);
+        const costResult = await GuildModel.costFund(code, dicDevelopConsume.fundConsume);
        if (!costResult) {
            res.releaseCallback();
            return resResult(STATUS.GUILD_FUND_NOT_ENOUGH);
        }
-        let scienceTree = { id, endTime: nowTime + developConsume.timeConsume, assistRoleIds: [] }
+        let scienceTree = { id, endTime: nowTime + dicDevelopConsume.timeConsume, assistRoleIds: [] }
        let { scienceTrees } = await GuildRefineModel.pushRefine(code, scienceTree);
        res.releaseCallback();
        return resResult(STATUS.SUCCESS, { scienceTrees });
--- a/game-server/app/servers/guild/handler/wishPoolHandler.ts
+++ b/game-server/app/servers/guild/handler/wishPoolHandler.ts
@@ -65,7 +65,7 @@ export class WishPoolHandler {

        let { structure } = await GuildModel.findGuild(code, serverId, 'structure');
        let { lv } = findWhere(structure, {id: GUILD_STRUCTURE.WISH_POOL});
-        let { wishGoodsEquips, wishGoodsHeros } = getArmyWishPoolBaseByLv(lv);
+        let { wishgoodsDrawings, wishGoodsHeros } = getArmyWishPoolBaseByLv(lv);
        let len = 0;
        wishGoods.map(({type: resType})=>{
            if (resType == type)
@@ -78,10 +78,10 @@ export class WishPoolHandler {
        if (len >= ARMY.ARMY_WISH_TIMES)  //今日已经许愿过
            return resResult(STATUS.HAS_REACH_WISH_COUNT_LIMIT);
        if (type == 1) {
-            let wishGoodsEquip = findWhere(wishGoodsEquips, { quality: goodInfo.quality});
-            if (!wishGoodsEquip)
+            let wishGoodsDrawing = findWhere(wishgoodsDrawings, { quality: goodInfo.quality});
+            if (!wishGoodsDrawing)
                return resResult(STATUS.NOT_WISH_THE_QUALITY_GOODS);
-            count = wishGoodsEquip.count;
+            count = wishGoodsDrawing.count;
        } else {
            let wishGoodsHero = findWhere(wishGoodsHeros, { quality: goodInfo.quality});
            if (!wishGoodsHero)