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

活动：节日活动添加每日关卡

Browse Source
This commit is contained in:
qiaoxin
2021-06-16 20:03:28 +08:00
parent bc0d859811
commit c0b3750f3b
13 changed files with 692 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

657
game-server/app/servers/activity/handler/activityHandler.ts
View File

@@ -133,361 +133,360 @@ export class ActivityHandler {
// }
// }
// }
//签到 4
{
let data = await signInActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.SIGN_IN,
activityId: data.activityId,
data,
});
}
}
//高级签到 5
{
let data = await signInVIPActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.SIGN_IN_VIP,
activityId: data.activityId,
data,
});
}
}
// //签到 4
// {
// let data = await signInActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.SIGN_IN,
// activityId: data.activityId,
// data,
// });
// }
// }
// //高级签到 5
// {
// let data = await signInVIPActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.SIGN_IN_VIP,
// activityId: data.activityId,
// data,
// });
// }
// }
//成长基金 6
{
let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_MAIN, serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.GROWTH_FUND_MAIN,
activityId: data.activityId,
data,
});
}
}
//高阶成长基金 7
{
let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP, serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP,
activityId: data.activityId,
data,
});
}
}
//镇念塔成长基金 8
{
let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_TOWER, serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.GROWTH_FUND_TOWER,
activityId: data.activityId,
data,
});
}
}
//高阶镇念塔成长基金 9
{
let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP, serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP,
activityId: data.activityId,
data,
});
}
}
//精英成长基金 10
{
let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE, serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE,
activityId: data.activityId,
data,
});
}
}
//高阶精英成长基金 11
{
let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP, serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP,
activityId: data.activityId,
data,
});
}
}
// //成长基金 6
// {
// let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_MAIN, serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.GROWTH_FUND_MAIN,
// activityId: data.activityId,
// data,
// });
// }
// }
// //高阶成长基金 7
// {
// let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP, serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP,
// activityId: data.activityId,
// data,
// });
// }
// }
// //镇念塔成长基金 8
// {
// let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_TOWER, serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.GROWTH_FUND_TOWER,
// activityId: data.activityId,
// data,
// });
// }
// }
// //高阶镇念塔成长基金 9
// {
// let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP, serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP,
// activityId: data.activityId,
// data,
// });
// }
// }
// //精英成长基金 10
// {
// let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE, serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE,
// activityId: data.activityId,
// data,
// });
// }
// }
// //高阶精英成长基金 11
// {
// let data = await growthFundActivity(ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP, serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP,
// activityId: data.activityId,
// data,
// });
// }
// }
//30天目标活动 12
{
let data = await thirtyDaysActivity(ACTIVITY_TYPE.THIRTY_DAYS, serverId, roleId);
if (data) {
let todayIndex = await playerThirtyDaysActivityDays(roleId);
playerActivityArray.push({
type: ACTIVITY_TYPE.THIRTY_DAYS,
activityId: data.activityId,
data: { playerData: data, todayIndex },
});
}
}
// //30天目标活动 12
// {
// let data = await thirtyDaysActivity(ACTIVITY_TYPE.THIRTY_DAYS, serverId, roleId);
// if (data) {
// let todayIndex = await playerThirtyDaysActivityDays(roleId);
// playerActivityArray.push({
// type: ACTIVITY_TYPE.THIRTY_DAYS,
// activityId: data.activityId,
// data: { playerData: data, todayIndex },
// });
// }
// }
//自选商店 糜家商队 13
{
let data = await getSelfServiceShopActivityData(serverId, roleId);
if (data) {
let playerGoods = await ActivitySelfServiceGoodsModel.findData(data.activityId, roleId, data.roundIndex, true);
playerActivityArray.push({
type: ACTIVITY_TYPE.SELF_SERVICE_SHOP,
activityId: data.activityId,
data: { playerData: data, playerGoods: playerGoods ? playerGoods : [] },
});
}
}
// //自选商店 糜家商队 13
// {
// let data = await getSelfServiceShopActivityData(serverId, roleId);
// if (data) {
// let playerGoods = await ActivitySelfServiceGoodsModel.findData(data.activityId, roleId, data.roundIndex, true);
// playerActivityArray.push({
// type: ACTIVITY_TYPE.SELF_SERVICE_SHOP,
// activityId: data.activityId,
// data: { playerData: data, playerGoods: playerGoods ? playerGoods : [] },
// });
// }
// }
//首冲礼包活动 14
{
let data = await firstGiftActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.FIRST_GIFT,
activityId: data.activityId,
data,
});
}
}
// //首冲礼包活动 14
// {
// let data = await firstGiftActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.FIRST_GIFT,
// activityId: data.activityId,
// data,
// });
// }
// }
//新手限定RMB购买礼包 15
{
let { createTime } = await RoleModel.findByRoleId(roleId);
let createDate = moment(createTime * 1000).toDate();
let endTime = moment(createDate).startOf('d').add(7, 'd').add(5, 'h').toDate();
if (new Date() <= endTime) {
let data = await newPlayerLimitPackageActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE,
activityId: data.activityId,
data,
});
}
}
}
//每日限购礼包，RMB购买礼包 16
{
let data = await limitPackageActivity(serverId, roleId, ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_DAILY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_DAILY,
activityId: data.activityId,
data,
});
}
}
//每日限购礼包，RMB购买礼包 17
{
let data = await limitPackageActivity(serverId, roleId, ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_WEEKLY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_WEEKLY,
activityId: data.activityId,
data,
});
}
}
// //新手限定RMB购买礼包 15
// {
// let { createTime } = await RoleModel.findByRoleId(roleId);
// let createDate = moment(createTime * 1000).toDate();
// let endTime = moment(createDate).startOf('d').add(7, 'd').add(5, 'h').toDate();
// if (new Date() <= endTime) {
// let data = await newPlayerLimitPackageActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE,
// activityId: data.activityId,
// data,
// });
// }
// }
// }
// //每日限购礼包，RMB购买礼包 16
// {
// let data = await limitPackageActivity(serverId, roleId, ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_DAILY);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_DAILY,
// activityId: data.activityId,
// data,
// });
// }
// }
// //每日限购礼包，RMB购买礼包 17
// {
// let data = await limitPackageActivity(serverId, roleId, ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_WEEKLY);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.LIMIT_PACKAGE_SHOP_WEEKLY,
// activityId: data.activityId,
// data,
// });
// }
// }
//元宝商店 18
{
let data = await yuanbaoActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.YUAN_BAO_SHOP,
activityId: data.activityId,
data,
});
}
}
// //元宝商店 18
// {
// let data = await yuanbaoActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.YUAN_BAO_SHOP,
// activityId: data.activityId,
// data,
// });
// }
// }
//月卡1 19
{
let data = await monthlyTicketActivity(serverId, roleId, ACTIVITY_TYPE.MONTHLY_TICKET_1);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.MONTHLY_TICKET_1,
activityId: data.activityId,
data,
});
}
}
// //月卡1 19
// {
// let data = await monthlyTicketActivity(serverId, roleId, ACTIVITY_TYPE.MONTHLY_TICKET_1);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.MONTHLY_TICKET_1,
// activityId: data.activityId,
// data,
// });
// }
// }
//月卡2 20
{
let data = await monthlyTicketActivity(serverId, roleId, ACTIVITY_TYPE.MONTHLY_TICKET_2);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.MONTHLY_TICKET_2,
activityId: data.activityId,
data,
});
}
}
// //月卡2 20
// {
// let data = await monthlyTicketActivity(serverId, roleId, ACTIVITY_TYPE.MONTHLY_TICKET_2);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.MONTHLY_TICKET_2,
// activityId: data.activityId,
// data,
// });
// }
// }
//累计充值RMB活动 21
{
let data = await rechargeMoneyActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.RECHARGE_MONEY,
activityId: data.activityId,
data,
});
}
}
//每日特惠RMB购买，一次性购买7天礼包 22
{
let data = await dailyRMBGiftsActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.DAILY_RMB_GIFTS,
activityId: data.activityId,
data,
});
}
}
// //累计充值RMB活动 21
// {
// let data = await rechargeMoneyActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.RECHARGE_MONEY,
// activityId: data.activityId,
// data,
// });
// }
// }
// //每日特惠RMB购买，一次性购买7天礼包 22
// {
// let data = await dailyRMBGiftsActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.DAILY_RMB_GIFTS,
// activityId: data.activityId,
// data,
// });
// }
// }
//寻宝骑兵活动 23
{
let data = await treasureHuntActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.TREASURE_HUNT,
activityId: data.activityId,
data,
});
}
}
// //寻宝骑兵活动 23
// {
// let data = await treasureHuntActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.TREASURE_HUNT,
// activityId: data.activityId,
// data,
// });
// }
// }
//弹出商店 24
{
let data = await popUpShopActivity(serverId, roleId);
if (data && data.length > 0) {
for (let obj of data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.POP_UP_SHOP,
activityId: obj.activityId,
data: obj,
});
}
}
}
// //弹出商店 24
// {
// let data = await popUpShopActivity(serverId, roleId);
// if (data && data.length > 0) {
// for (let obj of data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.POP_UP_SHOP,
// activityId: obj.activityId,
// data: obj,
// });
// }
// }
// }
//新手签到 25
{
let data = await newPlayerSignInActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN,
activityId: data.activityId,
data,
});
}
}
// //新手签到 25
// {
// let data = await newPlayerSignInActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN,
// activityId: data.activityId,
// data,
// });
// }
// }
//vip累计充值活动 26
{
let data = await vipRechargeMoneyActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.VIP_RECHARGE_MONEY,
activityId: data.activityId,
data,
});
}
}
// //vip累计充值活动 26
// {
// let data = await vipRechargeMoneyActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.VIP_RECHARGE_MONEY,
// activityId: data.activityId,
// data,
// });
// }
// }
//七天乐活动 27
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.SEVEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.SEVEN_DAY,
activityId: data.activityId,
data,
});
}
}
// //七天乐活动 27
// {
// let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.SEVEN_DAY);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.SEVEN_DAY,
// activityId: data.activityId,
// data,
// });
// }
// }
//十四天乐活动 28
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.FOURTEEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.FOURTEEN_DAY,
activityId: data.activityId,
data,
});
}
}
// //十四天乐活动 28
// {
// let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.FOURTEEN_DAY);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.FOURTEEN_DAY,
// activityId: data.activityId,
// data,
// });
// }
// }
//通用七天乐活动 29
{
let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.COMMON_SEVEN_DAY);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.COMMON_SEVEN_DAY,
activityId: data.activityId,
data,
});
}
}
// //通用七天乐活动 29
// {
// let data = await sevenDaysActivity(serverId, roleId, ACTIVITY_TYPE.COMMON_SEVEN_DAY);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.COMMON_SEVEN_DAY,
// activityId: data.activityId,
// data,
// });
// }
// }
//每日领取免费午饭、晚饭活动
{
let data = await dailyMealActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.DAILY_MEAL,
activityId: data.activityId,
data,
});
}
}
// //每日领取免费午饭、晚饭活动 30
// {
// let data = await dailyMealActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.DAILY_MEAL,
// activityId: data.activityId,
// data,
// });
// }
// }
//每日兑换铜币活动
{
let data = await dailyCoinActivity(serverId, roleId);
if (data) {
playerActivityArray.push({
type: ACTIVITY_TYPE.DAILY_COIN,
activityId: data.activityId,
data,
});
}
}
// //每日兑换铜币活动 31
// {
// let data = await dailyCoinActivity(serverId, roleId);
// if (data) {
// playerActivityArray.push({
// type: ACTIVITY_TYPE.DAILY_COIN,
// activityId: data.activityId,
// data,
// });
// }
// }
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let groups = await ActivityGroupModel.findGroupsData(activityGroupId);
let playerGroupArray = [];
for (let groupData of groups) {
if (groupData.type !== ACTIVITY_GROUP_TYPE.UNKNOW) {
let playerActivityArray = [];
for (let activityId of groupData.activities) {
let activityData = await ActivityModel.findActivity(activityId);
if (activityData) {
let playerActivityData = await getActivity(serverId, roleId, activityId, activityData.type)
if (playerActivityData) playerActivityArray.push(playerActivityData);
}
let playerGroupActivityArray = [];
for (let activityId of groupData.activities) {
let activityData = await ActivityModel.findActivity(activityId);
if (activityData) {
let playerActivityData = await getActivity(serverId, roleId, activityId, activityData.type)
if (playerActivityData) playerGroupActivityArray.push(playerActivityData);
}
playerGroupArray.push({
type: groupData.type,
activities: playerActivityArray,
});
}
playerGroupArray.push({
type: groupData.type,
activities: playerGroupActivityArray,
});
console.log(`${roleId} 活动合集 groupId:${groupData.groupId}, 合集类型${groupData.type}, 一共${playerGroupActivityArray.length}个`)
}
return resResult(STATUS.SUCCESS, { playerActivityArray, playerGroupArray });

3
game-server/app/servers/activity/handler/dailyCoinHandler.ts
View File

@@ -10,6 +10,7 @@ import { RewardParam } from '../../../domain/activityField/rewardField';
import { ItemInter } from '../../../pubUtils/interface';
import { getGoldObject } from '../../../pubUtils/itemUtils';
import { RoleModel } from '../../../db/Role';
import moment = require('moment');
export default function (app: Application) {
@@ -123,7 +124,7 @@ export class DailyCoinHandler {
//免费期间
let result = await addReward(roleId, roleName, sid, serverId, funcs, newReward)
await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.beginTime, count, addCoin, `${count}&${consumeGold}&${addCoin}`);
await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.beginTime, count, addCoin, `${count}&${consumeGold}&${addCoin}&${moment(new Date().valueOf())}`);
let exchangeCount = playerData.exchangeCount + count;
return resResult(STATUS.SUCCESS, Object.assign(result, {

79
game-server/app/servers/activity/handler/dailyGKHandler.ts Normal file
View File

@@ -0,0 +1,79 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS } from '../../../consts';
import { getPlayerDailyGKData } from '../../../services/dailyGKService';
import { DailyGKItem } from '../../../domain/activityField/dailyGKField';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { ActivityDailyGKModel } from '../../../db/ActivityDailyGK';
export default function (app: Application) {
return new DailyGKHandler(app);
}
export class DailyGKHandler {
constructor(private app: Application) {
}
/************************每日关卡；按日开启，每日开启一关****************************/
/**
* @description 获取每日关卡活动数据
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof DailyGKHandler
*/
async getDailyGKActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerDailyGKData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, playerData);
}
/**
* @description 获取今日挑战的单个奖励
* @param {{ activityId: number, dayIndex: number}} msg
* @param {BackendSession} session
* @memberof DailyGKHandler
*/
async getGK(msg: { activityId: number, dayIndex: number }, session: BackendSession) {
const { activityId, dayIndex } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
const funcs = session.get('funcs');
let playerData = await getPlayerDailyGKData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
if (dayIndex > playerData.todayIndex) {
return resResult(STATUS.ACTIVITY_DAY_INDEX_OVER);
}
let dailyItemData: DailyGKItem = playerData.findDailyGKItem(dayIndex);
if (!dailyItemData) {
return resResult(STATUS.ACTIVITY_DATA_ERROR);
}
if (dailyItemData.isSuccess) {//已经达成
return resResult(STATUS.ACTIVITY_REWARDED);
}
await ActivityDailyGKModel.addRecord(serverId, activityId, roleId, dayIndex);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(dailyItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
dailyItemData.isSuccess = true;
return resResult(STATUS.SUCCESS, {
gkId: dailyItemData.gk
});
}
}

6
game-server/app/servers/activity/handler/dailyRMBGiftsHandler.ts
View File

@@ -1,7 +1,7 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS, } from '../../../consts';
import { getPlayerDailyGiftsData, makeDailyRMBGiftsReward } from '../../../services/dailyRMBGiftsService';
import { getPlayerDailyRMBGiftsData, makeDailyRMBGiftsReward } from '../../../services/dailyRMBGiftsService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { ActivityDailyRMBGiftsModel } from '../../../db/ActivityDailyRMBGifts';
@@ -29,7 +29,7 @@ export class DailyRMBGiftsHandler {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getPlayerDailyGiftsData(activityId, serverId, roleId)
let playerData = await getPlayerDailyRMBGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, { playerData });
@@ -49,7 +49,7 @@ export class DailyRMBGiftsHandler {
const roleName = session.get('roleName');
const funcs: number[] = session.get('funcs');
let playerData = await getPlayerDailyGiftsData(activityId, serverId, roleId)
let playerData = await getPlayerDailyRMBGiftsData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
if (id > 0) {//领取单个--免费奖励

9
game-server/app/servers/battle/handler/normalBattleHandler.ts
View File

@@ -22,6 +22,7 @@ import { Rank } from '../../../services/rankService';
import { checkTaskWithWar, checkTaskInBattleEnd, checkActivityTask } from '../../../services/taskService';
import { ActivitySelfServiceModel } from '../../../db/ActivitySelfService';
import { getSelfServiceShopActivityData } from '../../../services/selfServiceShopActivityService';
import { challengeDailyGK } from '../../../services/dailyGKService';
export default function (app: Application) {
return new NormalBattleHandler(app);
@@ -119,8 +120,8 @@ export class NormalBattleHandler {
}
// 关卡结算，记录使用的武将，获得奖励
async battleEnd(msg: { battleCode: string, battleId: number, isSuccess: boolean, star: number, heroes: Array<any>, }, session: BackendSession) {
const { battleCode, battleId, isSuccess, heroes = [], star } = msg;
async battleEnd(msg: { battleCode: string, battleId: number, isSuccess: boolean, star: number, heroes: Array<any>, activityId: number }, session: BackendSession) {
const { battleCode, battleId, isSuccess, heroes = [], star, activityId } = msg;
let roleId = session.get('roleId');
let roleName = session.get('roleName');
let sid = session.get('sid');
@@ -213,6 +214,10 @@ export class NormalBattleHandler {
let playerData = await getSelfServiceShopActivityData(serverId, roleId)
await ActivitySelfServiceModel.addChallengeRecord(serverId, playerData.activityId, roleId, playerData.roundIndex, 1, new Date())
}
} else if (warInfo.warType == WAR_TYPE.ACT_DAILY_GK) {
if (isSuccess) {
await challengeDailyGK(serverId, roleId, activityId, battleId)
}
}
if (isSuccess) { // 挑战胜利