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

活动：战令

Browse Source
This commit is contained in:
luying
2022-03-07 19:51:01 +08:00
parent 52351bdf4e
commit c7eabb44cf
20 changed files with 617 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/rechargeMoneyHandler.ts
-1
View File
@@ -69,7 +69,6 @@ export class RechargeMoneyHandler {
item.setHasGet(true);
return resResult(STATUS.SUCCESS, {
goods,
param: { activityId },
item: item
});
game-server/app/servers/activity/handler/taskPassHandler.ts
+88
View File
@@ -0,0 +1,88 @@
import { Application, BackendSession, HandlerService, } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { ITEM_CHANGE_REASON, STATUS, } from '../../../consts';
import { getTaskPassData, getTaskPassDataShow } from '../../../services/activity/taskPassService';
import { ActivityTaskPassModel, ReceivedReward } from '../../../db/ActivityTaskPass';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { nowSeconds } from '../../../pubUtils/timeUtil';
import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/activity/giftPackageService';
import { ItemInter } from '../../../pubUtils/interface';
import { isNumber, pick } from 'underscore';
import { handleCost } from '../../../services/rewardService';
export default function (app: Application) {
new HandlerService(app, {});
return new TaskPassHandler(app);
}
export class TaskPassHandler {
constructor(private app: Application) {
}
/************************战令系统****************************/
// 获得战令活动数据
public async getTaskPassData(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let playerData = await getTaskPassDataShow(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
return resResult(STATUS.SUCCESS, { playerData });
}
// （一键）领取
public async receiveItems(msg: { activityId: number, pageIndex: number, lv: number }, session: BackendSession) {
const { activityId, pageIndex, lv = 0 } = msg;
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const sid = session.get('sid');
const serverId = session.get('serverId');
let playerData = await getTaskPassData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let items = playerData.receiveItems(pageIndex, lv);
if(!items) return resResult(STATUS.ACTIVITY_ITEM_CANNOT_RECEIVE);
let records: ReceivedReward[] = [], rewards: RewardParam[] = [];
for(let item of items) {
records.push({ pageIndex, lv: item.lv, receiveTime: nowSeconds() });
rewards.push(...stringToRewardParam(item.reward));
}
await ActivityTaskPassModel.receiveItems(serverId, activityId, roleId, playerData.roundIndex, records);
let result = await addReward(roleId, roleName, sid, serverId, rewards, ITEM_CHANGE_REASON.ACT_DAILY_GK_BATTLE_END);
return resResult(STATUS.SUCCESS, { items, ...result });
}
// 加速
public async speedUp(msg: { activityId: number, count: number }, session: BackendSession) {
const { activityId, count } = msg;
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const sid = session.get('sid');
const serverId = session.get('serverId');
if(count == 0 || !isNumber(count)) return resResult(STATUS.WRONG_PARMS);
let playerData = await getTaskPassData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
let cost: ItemInter[] = [];
let consumeArr = stringToConsumeParam(playerData.spdUp.cost);
for(let consume of consumeArr) {
cost.push({ ...consume, count: consume.count * count });
}
let consumeResult = await handleCost(roleId, sid, consumeArr, ITEM_CHANGE_REASON.ACT_DAILY_GK_BATTLE_END);
if(!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
let addPoint = playerData.spdUp.point * count;
await ActivityTaskPassModel.addPoint(serverId, activityId, roleId, playerData.roundIndex, addPoint, count);
let result = playerData.addPoint(addPoint, count);
return resResult(STATUS.SUCCESS, result);
}
}
game-server/app/servers/chat/remote/guildRemote.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export class GuildRemote {
private GUILD_RACE_UPDATE = 'onRaceHorseUpdate'; /// 更新木牛流马
private GUILD_RACE_JOIN = 'onRaceHorseJoin'
private GUILD_RACE_EVENT = 'onRaceEventUpdate'; /// 更新木牛流马
private GUILD_POP_UP_ACTIVITY = 'onActivityUpdate'; /// 向军团成员发送弹窗礼包
private GUILD_POP_UP_ACTIVITY = 'onActivityTaskUpdate'; /// 向军团成员发送弹窗礼包
private GUILD_TRAIN_RESET = 'onGuildTainReset'; // 试炼场重置
private GUILD_BOSS_ENCOURAGE = 'onGuildBossEncourage'; // 鼓舞
private AUCTION_UPDATE = 'onAuctionUpdate'; // 拍卖行更新
game-server/app/servers/role/handler/taskHandler.ts
+4 -8
View File
@@ -1,6 +1,6 @@
import { Application, BackendSession, pinus, HandlerService, } from "pinus";
import { resResult, parseGoodStr, getRandSingleEelm } from "../../../pubUtils/util";
import { STATUS, TASK_FUN_TYPE, SHOP_REFRESH_TYPE, KING_EXP_RATIO_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON } from "../../../consts";
import { STATUS, TASK_FUN_TYPE, SHOP_REFRESH_TYPE, KING_EXP_RATIO_TYPE, DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, ACTIVITY_TYPE } from "../../../consts";
import { gameData } from "../../../pubUtils/data";
import { UserTaskRecModel } from "../../../db/UserTaskRec";
import { addItems } from "../../../services/rewardService";
@@ -9,12 +9,12 @@ import { nowSeconds, getZeroPointD } from "../../../pubUtils/timeUtil";
import { DicDailyTask, DicAchievement, DicMainTask } from "../../../pubUtils/dictionary/DicTask";
import { getMainTask, refDailyTaskBox, removeHistoryTask, getCurTask, checkTask, getPvpTask } from "../../../services/taskService";
import { TASK } from "../../../pubUtils/dicParam";
import { newHeroGiftPoint } from "../../../services/activity/newHeroGiftsService";
import { ActivityTaskPointModel, ActivityTaskPointModelType } from "../../../db/ActivityTaskPoint";
import { ItemInter, RewardInter } from "../../../pubUtils/interface";
import { RoleModel } from "../../../db/Role";
import { roleLevelup } from "../../../services/normalBattleService";
import _ = require("underscore");
import { addActvityTaskPoint } from "../../../services/activity/activityService";
export default function (app: Application) {
new HandlerService(app, {});
@@ -79,12 +79,8 @@ export class ShopHandler {
}
//任务完成后关联活动的积分
let activityTaskPoint: ActivityTaskPointModelType[] = await ActivityTaskPointModel.findData(type, id);
for (let obj of activityTaskPoint) {
await newHeroGiftPoint(serverId, obj.activityId, roleId, obj.point);
let uids = [{ uid: roleId, sid }];
this.app.get('channelService').pushMessageByUids('addPoint', resResult(STATUS.SUCCESS, { activityId: obj.activityId, addPoint: point }), uids);
}
await addActvityTaskPoint(type, id, session );
let goods = await addItems(roleId, roleName, sid, taskReward, ITEM_CHANGE_REASON.TASK_REWARD);
if (expItem && expItem.count > 0) {
game-server/app/services/activity/activityService.ts
+62 -5
View File
@@ -21,12 +21,12 @@ import { getPlayerDailyGKData } from './dailyGKService';
import { getPlayerRefreshShopData } from './refreshShopService';
import { getPlayerRefreshTaskData } from './refreshTaskService';
import { getPlayerMonopolyData } from './monopolyService';
import { getPlayerNewHeroGiftsData } from './newHeroGiftsService';
import { getPlayerNewHeroGiftsData, newHeroGiftPoint } from './newHeroGiftsService';
import { getPlayerNewHeroGKData } from './newHeroGKService';
import { getPlayerNewHeroGachaData } from './newHeroGachaService';
import { pinus } from 'pinus';
import { BackendSession, pinus } from 'pinus';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { getRandSingleEelm } from '../../pubUtils/util';
import { getRandSingleEelm, resResult } from '../../pubUtils/util';
import { SignInData } from '../../domain/activityField/signInField';
import { ActivityGroupModel } from '../../db/ActivityGroup';
import { ActivityGroupTypeModel } from '../../db/ActivityGroupType';
@@ -34,6 +34,9 @@ import { ServerlistModel } from '../../db/Serverlist';
import { ActivityInRemote, transActivityInRemoteToModelType } from '../../domain/activityField/activityField';
import { getPlayerLuckyTurntableDataShow } from './luckyTurntableService';
import { getTimeLimitRankDataShow } from './timeLimitRankService';
import { ActivityTaskPointModel } from '../../db/ActivityTaskPoint';
import { getRoleOnlineInfo } from '../redisService';
import { addTaskPassPoint } from './taskPassService';
/**
* 获取活动数据
@@ -315,11 +318,65 @@ export async function checkActivityGroupType(groupType: number, activities: Acti
let index = dic.findIndex(cur => cur.activityType == type);
if(index == -1) {
return false;
} else {
dic.splice(index, 1);
}
}
}
return true
}
/**
* 达成任务可活动活动积分
* @param type 任务类型，主线、每日、成就
* @param id
* @param point
* @param session
*/
export async function addActvityTaskPoint(type: number, id: number, session: BackendSession) {
let serverId: number = session.get('serverId');
let roleId: string = session.get('roleId');
let sid: string = session.get('sid');
let activityTaskPoint = await ActivityTaskPointModel.findData(type, id);
let result: pushActivityInter[] = [];
for (let { activityId, activityType, point } of activityTaskPoint) {
console.log('##### activityTaskPoint:', activityId, activityType, point)
if(activityType == ACTIVITY_TYPE.NEW_HERO_GIFTS) { // 新武将活动
let totalPoint = await newHeroGiftPoint(serverId, activityId, roleId, point);
result.push({ activityId, activityType, param: { totalPoint } });
} else if (activityType == ACTIVITY_TYPE.TASK_PASS) {
let totalPoint = await addTaskPassPoint(serverId, activityId, roleId, point);
result.push({ activityId, activityType, param: { totalPoint } });
} else {
break;
}
}
await pushActivities(result, roleId, sid);
}
interface pushActivityParamInter {
ticketCnt?: number; // 木签活动的签数(type21)
totalPoint?: number; // 新将好礼（type37）和战令（type42）更新后的积分
}
export interface pushActivityInter {
activityId: number,
activityType: number,
param: pushActivityParamInter;
}
export async function pushSingleActivity(activityId: number, activityType: number, param: pushActivityParamInter, roleId: string, sid?: string) {
await pushActivities([{ activityId, activityType, param }], roleId, sid);
}
export async function pushActivities(arr: pushActivityInter[], roleId: string, sid?: string) {
if(!sid) {
let onlineUser = await getRoleOnlineInfo(roleId);
sid = onlineUser.sid;
}
pinus.app.get('channelService').pushMessageByUids('onActivityUpdate',
resResult(STATUS.SUCCESS, {
activities: arr
}),
[{ uid: roleId, sid }]);
}
game-server/app/services/activity/newHeroGiftsService.ts
+2 -1
View File
@@ -54,5 +54,6 @@ export async function getPlayerNewHeroGiftsData(activityId: number, serverId: nu
*
*/
export async function newHeroGiftPoint(serverId: number, activityId: number, roleId: string, addPoint: number) {
await ActivityNewHeroGiftModel.addPoint(serverId, activityId, roleId, addPoint);
let result = await ActivityNewHeroGiftModel.addPoint(serverId, activityId, roleId, addPoint);
return result.totalPoint;
}
game-server/app/services/activity/rechargeMoneyService.ts
+17 -2
View File
@@ -2,7 +2,9 @@ import { ActivityRechargeMoneyModel, ActivityRechargeMoneyModelType } from '../.
import { RechargeMoneyData } from '../../domain/activityField/rechargeMoneyField';
import moment = require('moment');
import { RoleModel } from '../../db/Role';
import { getActivityById } from './activityService';
import { getActivitiesByType, getActivityById, pushActivities, pushActivityInter } from './activityService';
import { ACTIVITY_TYPE } from '../../consts';
import { getRoleOnlineInfo } from '../redisService';
/**
* 玩家活动数据
@@ -43,6 +45,19 @@ export async function getPlayerRechargeMoneyDataShow(activityId: number, serverI
export async function addRechargeMoney(roleId: string, serverId: number, RMB: number) {
let beginTime = moment(new Date()).startOf('d').toDate();
let endTime = moment(new Date()).endOf('d').toDate();
await ActivityRechargeMoneyModel.addRMB(serverId, roleId, RMB, beginTime, endTime);
let result = await ActivityRechargeMoneyModel.addRMB(serverId, roleId, RMB, beginTime, endTime);
if(result.RMB == RMB) { // 获得木签的时候推送给在线玩家
let onlineUser = await getRoleOnlineInfo(roleId);
if(!!onlineUser.sid) {
let result: pushActivityInter[] = [];
let activities = await getActivitiesByType(serverId, ACTIVITY_TYPE.RECHARGE_MONEY);
for(let { activityId, type: activityType } of activities) {
let playerData = await getPlayerRechargeMoneyData(activityId, serverId, roleId);
result.push({ activityId, activityType, param: { ticketCnt: playerData.ticketCnt } });
}
await pushActivities(result, roleId, onlineUser.sid);
}
}
}
game-server/app/services/activity/taskPassService.ts
+70
View File
@@ -0,0 +1,70 @@
import { ACTIVITY_TYPE, STATUS } from "../../consts";
import { ActivityModelType } from "../../db/Activity";
import { ActivityTaskPassModel } from "../../db/ActivityTaskPass";
import { RoleModel } from "../../db/Role";
import { TaskPassData } from "../../domain/activityField/taskPassField";
import { getActivityById } from "./activityService";
export async function getTaskPassData(activityId: number, serverId: number, roleId: string) {
let activityData = await getActivityById(activityId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new TaskPassData(activityData, createTime);
let record = await ActivityTaskPassModel.findData(serverId, activityId, roleId, playerData.roundIndex);
playerData.setPlayerRecord(record);
return playerData;
}
export async function getTaskPassDataShow(activityId: number, serverId: number, roleId: string) {
let playerData = await getTaskPassData(activityId, serverId, roleId);
if(playerData && playerData.canShow && playerData.canShow()) {
return playerData.getShowResult();
}
return null
}
/**
* 购买高级战令
*
* @param {number} serverId 区Id
* @param {number} activityId 活动Id
* @param {string} roleId 角色Id
* @param {string} productID 商品ID
*
*/
export async function makeTaskPass(roleId: string, roleName: string, sid: string, serverId: number, activityId: number, productID: string) {
let activityData: ActivityModelType = await getActivityById(activityId);
if (!activityData) {
return STATUS.ACTIVITY_MISSING;
}
if (activityData.type !== ACTIVITY_TYPE.TASK_PASS) {
return STATUS.ACTIVITY_TYPE_ERROR;
}
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new TaskPassData(activityData, createTime);
let roundIndex = playerData.roundIndex;
await ActivityTaskPassModel.buy(serverId, activityId, roleId, roundIndex, productID);
return {
code: 0,
data: Object.assign({}, { item: { roundIndex }, activityId: activityId })
}
}
/**
* 任务活动完成后会获得点数
*
* @param {number} serverId 区Id
* @param {number} activityId 活动Id
* @param {string} roleId 角色Id
*
*/
export async function addTaskPassPoint(serverId: number, activityId: number, roleId: string, addPoint: number) {
let activity = await getActivityById(activityId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let data = new TaskPassData(activity, createTime);
let result = await ActivityTaskPassModel.addPoint(serverId, activityId, roleId, data.roundIndex, addPoint);
return result.totalPoint;
}
game-server/app/services/orderService.ts
+9 -2
View File
@@ -29,6 +29,7 @@ import { PayCallback37Data } from '../domain/sdk';
import { reportTAEvent, reportTAUserSet } from './sdkService';
import { savePayLog } from '../pubUtils/logUtil';
import { recordFirstGift } from './activity/firstGiftService';
import { makeTaskPass } from './activity/taskPassService';
/**
@@ -131,6 +132,12 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
rewardResult = await makeRefreshShopReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID, 0)
break;
}
case ACTIVITY_TYPE.TASK_PASS: // 战令-高级卡
{
rewardResult = await makeTaskPass(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID)
break;
}
default:
rewardResult = STATUS.ERROR_TYPE;
break;
@@ -171,8 +178,8 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s
}), [{ uid: order.roleId, sid }]);
}
//活动统计
await addRechargeMoney(order.roleId, serverId, order.price);
await addVipRechargeMoney(order.roleId, serverId, order.price);
addRechargeMoney(order.roleId, serverId, order.price);
addVipRechargeMoney(order.roleId, serverId, order.price);
//成长任务
await checkActivityTask(serverId, sid, order.roleId, TASK_TYPE.ACTIVITY_RMB, order.price, { activityId: order.activityId });
if(order.payType != PAY_TYPE.TEST) {
game-server/app/services/taskService.ts
+1 -1
View File
@@ -93,7 +93,7 @@ export async function pushActivityUpdate(roleId: string, sid: string, pushMessag
}
if (!!sid) {
let uids = [{ uid: roleId, sid }];
pinus.app.get('channelService').pushMessageByUids('onActivityUpdate', resResult(STATUS.SUCCESS, pushMessage), uids);
pinus.app.get('channelService').pushMessageByUids('onActivityTaskUpdate', resResult(STATUS.SUCCESS, pushMessage), uids);
}
}
}