✨ feat(活动): 添加两种密卷 ed96aa4ac

game-server/app/servers/battle/handler/rougeHandler.ts

@@ -1,7 +1,7 @@
 import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
 import { RougelikeRecordModel } from '../../../db/RougelikeRecord';
 import { genCode, getRandEelmWithWeight, resResult } from '../../../pubUtils/util';
-import { COLLECTION_TYPE, ITEM_CHANGE_REASON, REST_POINT_TYPE, ROUGE_LIKE_CARD_TYPE, ROUGE_LIKE_CHOOSE_REWARD, ROUGE_LIKE_NODE_TYPE, ROUGE_LIKE_STATUS } from '../../../consts';
+import { COLLECTION_TYPE, ITEM_CHANGE_REASON, REST_POINT_TYPE, ROUGE_LIKE_CARD_TYPE, ROUGE_LIKE_CHOOSE_REWARD, ROUGE_LIKE_NODE_TYPE, ROUGE_LIKE_STATUS, TASK_TYPE } from '../../../consts';
 import { Quest, RestPoint, RougelikeRecordDetailModel } from '../../../db/RougelikeRecordDetail';
 import { STATUS } from '../../../consts/statusCode';
 import { RougelikeCardModel, RougelikeCardPara, RougelikeCardType } from '../../../db/RougelikeCard';
@@ -29,6 +29,7 @@ import { getEffectWhenGameStart, getCharaHp, getAddCoin, getNoBossRecoveryHp, ge
 import { RougelikeExtendModel } from '../../../db/RougelikeExtend';
 import * as util from 'util';
 import { DicRougePassiveCard } from '../../../pubUtils/dictionary/DicRougePassiveCard';
+import { checkTask } from '../../../services/task/taskService';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -172,6 +173,7 @@ export class RougeHandler {
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
         let sid = session.get('sid');
+        let serverId = session.get('serverId');
 
         const { gameCode } = msg;
         let dbRecord = await RougelikeRecordModel.findByGameCode(gameCode)
@@ -235,6 +237,7 @@ export class RougeHandler {
                 firstReward = await addItems(roleId, roleName, sid, typeGradeData?.firstReward || [], ITEM_CHANGE_REASON.ROUGE_FIRST_REWARD);
                 await RougelikeExtendModel.update(roleId, typeGradeData.id, firstReward, gameCode);
             }
+            await checkTask(serverId, roleId, sid, TASK_TYPE.FUND_ROUGE, { rougeId: typeGradeData.id });
         }
 
 

game-server/app/servers/role/handler/authorBookHandler.ts

@@ -1,5 +1,5 @@
 import { Application, BackendSession, HandlerService, } from "pinus";
-import { STATUS, HERO_SYSTEM_TYPE, ITEM_CHANGE_REASON } from "../../../consts";
+import { STATUS, HERO_SYSTEM_TYPE, ITEM_CHANGE_REASON, TASK_TYPE } from "../../../consts";
 import { gameData, getDicAuthorBookSub } from "../../../pubUtils/data";
 import { RewardInter } from "../../../pubUtils/interface";
 
@@ -10,6 +10,7 @@ import { addItems, handleCost } from "../../../services/role/rewardService";
 import { combineItems } from "../../../services/role/util";
 import { AuthorBookModel } from "../../../db/AuthorBook";
 import { checkAuthorBookLimit, replaceAuthorBooks } from "../../../services/roleService";
+import { checkTask } from "../../../services/task/taskService";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -77,6 +78,9 @@ export class AuthorsBookHandler {
 
         let curAuthorBook = authorBookData.authors?.find(cur => cur.subId == subId);
         let maxProgress = gameData.authorBookMaxProgress.get(bookId)??0;
+        
+        await checkTask(serverId, roleId, sid, TASK_TYPE.FUND_AUTHOR, { authorProgress: await AuthorBookModel.findProgressByRoleId(roleId) });
+
         return resResult(STATUS.SUCCESS, { 
             bookId,
             subId,
@@ -119,6 +123,9 @@ export class AuthorsBookHandler {
 
         let curAuthorBook = authorBookData.authors?.find(cur => cur.subId == subId);
         let maxProgress = gameData.authorBookMaxProgress.get(bookId)??0;
+
+        await checkTask(serverId, roleId, sid, TASK_TYPE.FUND_AUTHOR, { authorProgress: await AuthorBookModel.findProgressByRoleId(roleId) });
+
         return resResult(STATUS.SUCCESS, { 
             bookId,
             subId,

game-server/app/services/activity/activityService.ts

@@ -79,6 +79,10 @@ export async function getActivity(serverId: number, roleId: string, uid: number,
         case ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP://高阶镇念塔成长基金 9
         case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE://精英成长基金 10
         case ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP://高阶精英成长基金 11
+        case ACTIVITY_TYPE.GROWTH_FUND_ROUGE://学宫普通密卷 60
+        case ACTIVITY_TYPE.GROWTH_FUND_ROUGE_VIP://学宫高级密卷 61
+        case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR://列传普通密卷 62
+        case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR_VIP://列传高级密卷 63
             {
                 activityData = await getPlayerGrowthFundData(activityId, serverId, roleId);
                 break;

game-server/app/services/activity/growthFundService.ts

@@ -7,6 +7,9 @@ import { GrowthFundData } from '../../domain/activityField/growthFundField';
 import { ServerlistModel } from '../../db/Serverlist';
 import { getActivitiesByType, getActivityById } from './activityService';
 import { getRoleCreateTime, getServerCreateTime } from '../redisService';
+import { RougelikeExtendModel } from '../../db/RougelikeExtend';
+import { AuthorBookModel } from '../../db/AuthorBook';
+import * as util from 'util';
 
 /**
    * 获取活动数据
@@ -23,6 +26,11 @@ import { getRoleCreateTime, getServerCreateTime } from '../redisService';
   GROWTH_FUND_TOWER_VIP = 9, // 镇念塔成长基金（高阶）
   GROWTH_FUND_MAIN_ELITE = 10, // 精英成长基金
   GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
+  GROWTH_FUND_ROUGE = 60, //学宫普通密卷
+  GROWTH_FUND_ROUGE_VIP = 61, //学宫高级密卷
+  GROWTH_FUND_AUTHOR = 62,    //列传普通密卷
+  GROWTH_FUND_AUTHOR_VIP = 63, //列传高级密卷
+
 */
 export async function growthFundActivity(type: number, serverId: number, roleId: string) {
     let activityArray = await getActivitiesByType(serverId, type);
@@ -111,9 +119,39 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
                 }
                 break;
             }
+        case ACTIVITY_TYPE.GROWTH_FUND_ROUGE: //学宫普通密卷
+        case ACTIVITY_TYPE.GROWTH_FUND_ROUGE_VIP: //学宫高级密卷
+            {
+                const dbRougeExtends = await RougelikeExtendModel.findByRoleId(roleId);
+                if (dbRougeExtends.length <= 0) break;
+                const limitIdMap = dbRougeExtends.reduce((result, cur) => { result.set(cur.limitId, cur.limitId); return result; }, new Map<number, number>());
+                for (let page of playerData.list) {
+                    for (let item of page.items) {
+                        if (item.taskType == TASK_TYPE.FUND_ROUGE) {
+                            if (limitIdMap.has(item.taskParamArray[0])) item.isComplete = true;
+                        }
+                    }
+                }
+                break;
+            }
+        case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR: //列传普通密卷
+        case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR_VIP: //列传高级密卷
+            {
+                const progress = await AuthorBookModel.findProgressByRoleId(roleId);
+                for (let page of playerData.list) {
+                    for (let item of page.items) {
+                        if (item.taskType == TASK_TYPE.FUND_AUTHOR) {
+                            if (progress >= item.taskParamArray[0]) item.isComplete = true;
+                        }
+                    }
+                }
+                break;
+            }
+            
         default:
             break;
     }
+
     return playerData;
 }
 
@@ -135,7 +173,11 @@ export async function makeGrowthFund(roleId: string, roleName: string, sid: stri
     if (!activityData) {
         return STATUS.ACTIVITY_MISSING;
     }
-    if (activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP && activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP && activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP) {
+    if (activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP 
+        && activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP 
+        && activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP 
+        && activityData.type != ACTIVITY_TYPE.GROWTH_FUND_ROUGE_VIP 
+        && activityData.type != ACTIVITY_TYPE.GROWTH_FUND_AUTHOR_VIP ) {
         return STATUS.ACTIVITY_TYPE_ERROR;
     }
     let createTime = await getRoleCreateTime(roleId);

game-server/app/services/orderService.ts

@@ -186,6 +186,16 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
                 rewardResult = await makeGrowthFund(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID)
                 break;
             }
+        case ACTIVITY_TYPE.GROWTH_FUND_ROUGE_VIP://学宫密卷（高阶）
+            {
+                rewardResult = await makeGrowthFund(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID)
+                break;
+            }
+        case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR_VIP://列传密卷（高阶）
+            {
+                rewardResult = await makeGrowthFund(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID)
+                break;
+            }
         case ACTIVITY_TYPE.TREASURE_HUNT://寻宝奇兵活动-每日物资商店
             {
                 rewardResult = await makeShop(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID)

game-server/app/services/task/taskObj.ts

@@ -346,6 +346,22 @@ export class CheckSingleTask {
                         await this.checkFundAcctivityTask(activity, param.warId);
                         break;
                     }
+                case ACTIVITY_TYPE.GROWTH_FUND_ROUGE:
+                case ACTIVITY_TYPE.GROWTH_FUND_ROUGE_VIP:
+                    {
+                        //学宫成长基金
+                        if (taskType != TASK_TYPE.FUND_ROUGE) continue;
+                        await this.checkFundAcctivityTask(activity, param.rougeId);
+                        break;
+                    }
+                case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR:
+                case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR_VIP:
+                    {
+                        //列传成长基金
+                        if (taskType != TASK_TYPE.FUND_AUTHOR) continue;
+                        await this.checkFundAcctivityTask(activity, param.authorProgress);
+                        break;
+                    }
             }
         }
 

game-server/test/activity.test.ts

@@ -27,22 +27,28 @@ describe('活动测试', function () {
     done();
   });
 
-  // it('获取所有活动', function (done) {
+  it('获取所有活动', function (done) {
-  //   pinusClient.request('activity.activityHandler.getAllOpenActivity', {}, (res) => {
+    pinusClient.request('activity.activityHandler.getAllOpenActivity', {}, (res) => {
-  //     console.log("x-x-x-x-x-x-x--x-x-x-x res", res)
+      checkSuccessResponse(res);
-  //     checkSuccessResponse(res);
+      playerGroupArray = res.data.playerGroupArray;
-  //     playerGroupArray = res.data.playerGroupArray;
+      console.log(`${playerGroupArray.length}个合集数据`)
-  //     console.log(`${playerGroupArray.length}个合集数据`)
+      done();
+    });
+  });
+
+  // it('获得祈灵活动数据', function (done) {
+  //   pinusClient.request('activity.growthFundHandler.getGrowthFundActivity', { activityId: 1300 }, (res) => {
+  //     console.log('-x-x--x-x-x-x-x-x-x-x-x- res', util.inspect(res, { depth: null }));
   //     done();
   //   });
   // });
 
-  it('获得祈灵活动数据', function (done) {
+  // it('获得祈灵活动数据', function (done) {
-    pinusClient.request('activity.authorGachaHandler.getData', { activityId: 1296 }, (res) => {
+  //   pinusClient.request('activity.authorGachaHandler.getData', { activityId: 1296 }, (res) => {
-      console.log('-x-x--x-x-x-x-x-x-x-x-x- res', util.inspect(res, { depth: null }));
+  //     console.log('-x-x--x-x-x-x-x-x-x-x-x- res', util.inspect(res, { depth: null }));
-      done();
+  //     done();
-    });
+  //   });
-  });
+  // });
 
 
   // it('获得祈灵活动数据', function (done) {

shared/consts/constModules/activityConst.ts

@@ -72,6 +72,11 @@ export enum ACTIVITY_TYPE {
     QIXI = 57,           // 七夕活动
     MID_AUTUMN = 58,     // 中秋活动
     AUTHOR_GACHA = 59,     //百家争鸣祈灵活动
+    GROWTH_FUND_ROUGE = 60, //学宫普通密卷
+    GROWTH_FUND_ROUGE_VIP = 61, //学宫高级密卷
+    GROWTH_FUND_AUTHOR = 62,    //列传普通密卷
+    GROWTH_FUND_AUTHOR_VIP = 63, //列传高级密卷
+
 }
 
 /**

shared/consts/constModules/sysConst.ts

@@ -929,6 +929,9 @@ export enum TASK_TYPE {
     MINI_GAME_SCORE = 139,              // 小游戏超过X分
     MINI_GAME_STEP = 140,               // 小游戏小于X步
 
+    FUND_ROUGE = 143,                   // 学宫密卷
+    FUND_AUTHOR = 144,                  // 列传密卷
+
 }
 
 // 任务累积类型

shared/db/AuthorBook.ts

@@ -51,6 +51,15 @@ export default class AuthorBook extends BaseModel {
         return result;
     }
 
+    public static async findProgressByRoleId(roleId:string, select = '-_id') {
+        let progressCount = 0;
+        let result: AuthorBookType[] = await AuthorBookModel.find({ roleId }).select(select).lean();
+        for(let {progress} of result){
+            progressCount+=progress;
+        }
+        return progressCount;
+    }
+
 }
 
 export const AuthorBookModel = getModelForClass(AuthorBook);

shared/domain/activityField/authorGachaField.ts

@@ -9,6 +9,7 @@ interface AuthorGachaDataInDb {
     box: {
         count: number;        // 次数
         rewards: string;      // type&id&count, type: 1-武将 2-道具 3-礼包
+        isSpecial: boolean; // 重要节点奖励标记
         hasReceived?: boolean;  // 是否获得
     }[];
 }
@@ -45,10 +46,10 @@ export class AuthorGachaData extends ActivityBase {
 
     public getShowResult() {
         let box: AuthorGachaDataInDb['box'] = [];
-        for (let { count, rewards } of this.box) {
+        for (let { count, rewards, isSpecial = false } of this.box) {
             let hasReceived = false;
             if (this.record.indexOf(count) != -1) hasReceived = true;
-            box.push({ count, rewards, hasReceived })
+            box.push({ count, rewards, hasReceived, isSpecial })
         }
 
         return {

shared/domain/activityField/growthFundField.ts

@@ -95,6 +95,22 @@ export class GrowthFundData extends ActivityBase {
                         }
                         break;
                     }
+                    case ACTIVITY_TYPE.GROWTH_FUND_ROUGE:
+                    case ACTIVITY_TYPE.GROWTH_FUND_ROUGE_VIP: {
+                        if (!this.isReceive(page.pageIndex, item.cellIndex) && item.taskParamArray[0] == condition) {
+                            item.isComplete = true;
+                            items.push(Object.assign(item, { pageIndex: page.pageIndex, activityId: this.activityId }))
+                        }
+                        break;
+                    }
+                    case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR:
+                    case ACTIVITY_TYPE.GROWTH_FUND_AUTHOR_VIP: {
+                        if (!this.isReceive(page.pageIndex, item.cellIndex) && item.taskParamArray[0] <= condition) {
+                            item.isComplete = true;
+                            items.push(Object.assign(item, { pageIndex: page.pageIndex, activityId: this.activityId }))
+                        }
+                        break;
+                    }
                 }
             }
         }
@@ -111,6 +127,8 @@ export class GrowthFundData extends ActivityBase {
         return this.type == ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP
             || this.type == ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP
             || this.type == ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP
+            || this.type == ACTIVITY_TYPE.GROWTH_FUND_ROUGE_VIP
+            || this.type == ACTIVITY_TYPE.GROWTH_FUND_AUTHOR_VIP
     }
 
     //是否购买page

shared/domain/roleField/task.ts

@@ -65,6 +65,8 @@ export class TaskParamInter {
     score?: number;      // 小游戏得分
     step?: number;       // 步数
     gameType?: number;   // 小游戏类型
+    rougeId?:number; //学宫
+    authorProgress?:number; // 列传
 };
 
 export class TaskParam extends TaskParamInter {

shared/resource/jsons/dic_zyz_activityType.json

@@ -328,5 +328,29 @@
         "activityType": 59,
         "name": "MID_AUTUMN",
         "string": "百家争鸣活动"
+    },
+    {
+        "id": 60,
+        "activityType": 60,
+        "name": "MID_AUTUMN",
+        "string": "学宫普通密卷"
+    },
+    {
+        "id": 61,
+        "activityType": 61,
+        "name": "MID_AUTUMN",
+        "string": "学宫高级密卷"
+    },
+    {
+        "id": 62,
+        "activityType": 62,
+        "name": "MID_AUTUMN",
+        "string": "列传普通密卷"
+    },
+    {
+        "id": 63,
+        "activityType": 63,
+        "name": "MID_AUTUMN",
+        "string": "列传高级密卷"
     }
 ]