xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
luying
2023-09-05 16:47:33 +08:00
parent 0b96397e80
commit 0e11635c5e
14 changed files with 167 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activity/activityService.ts
+4
View File
@@ -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
+43 -1
View File
@@ -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
+10
View File
@@ -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
+16
View File
@@ -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;
}
}
}