炼器堂

game-server/app/services/funcSwitchService.ts

@@ -4,6 +4,7 @@ import { RoleModel } from "../db/Role";
 import { resResult } from "../pubUtils/util";
 import { STATUS, FUNC_OPT_TYPE } from "../consts";
 import { eventOnPlayerLvUp } from '../services/playerEventService';
+import { checkesetTrain } from '../services/guildTrainService';
 // 开启功能
 export async function switchOnFunc(roleId: string, type: number, param: number, session: (BackendSession|FrontendSession)) {
 
@@ -33,4 +34,5 @@ export async function switchOnFunc(roleId: string, type: number, param: number,
 
 export async function chackFunOpenWhenLogin(role: any, session: BackendSession|FrontendSession) {
     await switchOnFunc(role.roleId, FUNC_OPT_TYPE.LEVEL_UP, role.lv, session);
+    await checkesetTrain(role.roleId, role.serverId);
 }

game-server/app/services/guildBossService.ts

@@ -8,6 +8,7 @@ import { pinus } from 'pinus';
 import { STATUS } from '../consts/statusCode';
 import { deepCopy, resResult } from '../pubUtils/util';
 import { BattleRecordModel } from '../db/BattleRecord';
+import { getArmyBossRank } from '../pubUtils/data';
 /**
  * 
  * @param bossInstance 
@@ -122,7 +123,9 @@ export async function bossResult(code: string, serverId: number, dataName: strin
     recordRanks.forEach(async function({roleId, score}, index){
         let rankLv = index + 1;
         const doc = new MailModel();
-        let goods;
+        let goods = getArmyBossRankReward(rankLv);
+        if (!goods || !goods.length)
+            return;
         const mail = Object.assign(doc.toJSON(), {roleId, goods, sendName: '系统', mailId: 1, sendTime: nowSeconds(), content:'恭喜玩家获得演武台第' + rankLv +'名 奖励如下：'});
         mails.push(mail);
         let key = 'login_roleId_' + roleId; 
@@ -137,6 +140,15 @@ export async function bossResult(code: string, serverId: number, dataName: strin
     });
     return true;
 }
+
+export function getArmyBossRankReward(rankLv: number) {
+    let armybossRankReward = getArmyBossRank();
+    for (let item of armybossRankReward) {
+        if (item.rankMin <= rankLv && (rankLv <= item.rankMax || item.rankMax == -1)) {
+            return item.reward;
+        }
+    }
+}
  
 export async function addBossInstance(code: string, serverId:number, roleId: string) {
     let loginKey = 'login_roleId_' + roleId; 

game-server/app/services/guildRefineService.ts

@@ -0,0 +1,30 @@
+import { UserGuildModel } from '../db/UserGuild';
+import { getArmyTrainJuDian, getArmyDevelopConsume } from '../pubUtils/data';
+import { nowSeconds, getHourPoint } from '../pubUtils/timeUtil';
+import { GUILD_REPORT_NUM, GUILD_DATA_NAME, REFRESH_HOUR } from '../consts/constModules/guildConst';
+import { GuildTrainType, GuildTrainModel, TrainInstance } from '../db/GuildTrain';
+import { GuildModel } from '../db/Guild';
+import { findWhere } from 'underscore';
+import { ARMY } from '../pubUtils/dicParam';
+import { lockData } from './redLockService';
+import { pinus } from 'pinus';
+import { MailModel, MailType } from '../db/Mail';
+import { getRandomByLen, resResult } from '../pubUtils/util';
+import { getRedis } from './redisService';
+import { STATUS } from '../consts/statusCode';
+import { ScienceTree, GuildRefineModel } from '../db/GuildRefine';
+export async function openGuildRefine(code: string) {
+    let developConsumes = getArmyDevelopConsume();
+    let scienceTrees = new Array<ScienceTree>();
+    developConsumes.forEach(developConsume=>{
+        if (developConsume.fundConsume == 0 && developConsume.timeConsume == 0) {
+            let scienceTree = new ScienceTree();
+            scienceTree.id = developConsume.id;
+            scienceTree.endTime = 0
+            scienceTree.assistRoleIds = [];
+            scienceTrees.push(scienceTree);
+        }
+    });
+    let guildRefine = await GuildRefineModel.createScienceTree(code, scienceTrees);
+    return guildRefine;
+}

game-server/app/services/guildTrainService.ts

@@ -6,11 +6,11 @@ import { GuildTrainType, GuildTrainModel, TrainInstance } from '../db/GuildTrain
 import { GuildModel } from '../db/Guild';
 import { findWhere } from 'underscore';
 import { ARMY } from '../pubUtils/dicParam';
-import { lockData } from '../services/redLockService';
+import { lockData } from './redLockService';
 import { pinus } from 'pinus';
 import { MailModel, MailType } from '../db/Mail';
 import { getRandomByLen, resResult } from '../pubUtils/util';
-import { getRedis } from '../services/redisService';
+import { getRedis } from './redisService';
 import { STATUS } from '../consts/statusCode';
 export async function getUserGuild(roleId: string, serverId: number) {
     let userGuild = await UserGuildModel.getMyGuild(roleId,'trainCount trainTime trainRewards');
@@ -109,7 +109,7 @@ export  function getGuildTrainInfo (guildTrains: Array<GuildTrainType>, roleId:
     return { guildTrain, trainCount, trainRewards};
 }
 
-export async function lockTrain(code: string, trainId: number) {
+export async function unlockTrain(code: string, trainId: number) {
     let guildTrain = await GuildTrainModel.findTrainByTrainIdNotLock(code, trainId);
     if (!!guildTrain) {
         return;
@@ -180,6 +180,13 @@ export async function resetTrain(code: string, serverId: number) {
     pinus.app.channelService.pushMessageByUids('onGuildTainReset', resResult(STATUS.SUCCESS, {}), uids);
     await MailModel.addMails(mails);
     await GuildTrainModel.resetGuildTrain(code);
-    await lockTrain(code, 1);
+    await unlockTrain(code, 1);
     await UserGuildModel.resetTrainUserGuild(code);
+}
+
+export async function checkesetTrain(roleId: string, serverId: number) {
+    let userGuild = await UserGuildModel.getMyGuild(roleId,'guildCode');
+    if (!userGuild)
+        return;
+    await resetTrain(userGuild.guildCode, serverId);
 }