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

任务：埋点48/71

Browse Source
This commit is contained in:
luying
2021-04-19 13:17:17 +08:00
parent 9f4f346447
commit 4bd4513ae6
11 changed files with 186 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/consts/constModules/sysConst.ts
+12
View File
@@ -612,4 +612,16 @@ export enum TASK_TYPE {
FRIEND_SEND_HEART = 35, // 赠送友情点
CHAT = 36, // 发送消息
BATTLE_COST_AP = 37, // 消耗体力
BATTLE_WITH_HERO = 38, // 使用某武将挑战某关卡
BATTLE_MAIN = 39, // 通关主线
BATTLE_MAIN_SWEEP = 40, // 扫荡主线
BATTLE_EVENT = 41, // 奇遇
BATTLE_DAILY_STAR = 42, // 每日x星通关
BATTLE_DAILY = 43, // 每日通关
BATTLE_DUNGEON = 44, // 秘境
BATTLE_DUNGEON_WAR = 45, // 通关秘境有些关卡
BATTLE_TOWER_LV = 46, // 镇念塔层数
BATTLE_TOWER = 47, // 镇念塔
BATTLE_VESTIGE = 48, // 遗迹
}
shared/db/BattleRecord.ts
+2
View File
@@ -10,6 +10,8 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
class Record {
@prop({ required: true, type: Number })
heroes: Array<number>; // 武将id
@prop({ required: true, type: Number })
seqIds: Array<number>; // 武将seqid
@prop({ required: false })
oppRoleId?: string; // pvp对手
@prop({ required: false })
shared/domain/roleField/task.ts
+4
View File
@@ -9,4 +9,8 @@ export class TaskParam {
oldLv?: number;
stage?: number;
chatType?: number;
warId?: number;
heroes?: number[];
eventType?: number;
dailyType?: number;
}
shared/pubUtils/taskUtil.ts
+99 -4
View File
@@ -1,6 +1,6 @@
import { gameData } from './data';
import { DicTask } from './dictionary/DicTask';
import { TASK_TYPE, ABI_STAGE } from '../consts';
import { TASK_TYPE, ABI_STAGE, WAR_TYPE } from '../consts';
import { UserTaskRecModel, UserTaskRecType } from '../db/UserTaskRec'
import { RoleType } from '../db/Role';
import { TaskParam } from '../domain/roleField/task';
@@ -32,7 +32,7 @@ export async function checkTaskWithRole(roleId: string, taskType: number, role:
let today = getTodayZeroPoint();
if(today > role.loginTime) {
if(today - role.loginTime > 24 * 60 * 60 ) {
pushMessage = await checkTask(roleId, taskType, 1, false, {});
pushMessage = await checkTask(roleId, taskType, 0, false, {});
} else {
pushMessage = await checkTask(roleId, taskType, 1, true, {});
}
@@ -226,6 +226,63 @@ export async function checkTaskWithArgs(roleId: string, taskType: number, args:
return pushMessage
}
export async function checkTaskWithWar(roleId: string, taskType: number, warId: number, heroes: number[], count: number, star: number) {
let dicWar = gameData.war.get(warId);
let pushMessage = new Array<{type: number, id: number, count: number, received: boolean}>();
if(taskType == TASK_TYPE.BATTLE_WITH_HERO)
{
pushMessage = await checkTask(roleId, taskType, count, true, { warId, heroes });
}
else if (taskType == TASK_TYPE.BATTLE_MAIN)
{
if(dicWar.warType == WAR_TYPE.NORMAL) {
pushMessage = await checkTask(roleId, taskType, count, true, { warId });
}
}
else if (taskType == TASK_TYPE.BATTLE_MAIN_SWEEP)
{
if(dicWar.warType == WAR_TYPE.NORMAL) {
pushMessage = await checkTask(roleId, taskType, count, true, {});
}
}
else if (taskType == TASK_TYPE.BATTLE_DAILY_STAR)
{
if(dicWar.warType == WAR_TYPE.DAILY) {
pushMessage = await checkTask(roleId, taskType, count, true, { warId, star });
}
}
else if (taskType == TASK_TYPE.BATTLE_DAILY)
{
if(dicWar.warType == WAR_TYPE.DAILY) {
pushMessage = await checkTask(roleId, taskType, count, true, { dailyType: dicWar.dailyType })
}
}
else if (taskType == TASK_TYPE.BATTLE_DUNGEON)
{
if(dicWar.warType == WAR_TYPE.MYSTERY||dicWar.warType == WAR_TYPE.MYSTERY_ELITE) {
pushMessage = await checkTask(roleId, taskType, count, true, {});
}
}
else if (taskType == TASK_TYPE.BATTLE_DUNGEON_WAR)
{
if(dicWar.warType == WAR_TYPE.MYSTERY||dicWar.warType == WAR_TYPE.MYSTERY_ELITE) {
pushMessage = await checkTask(roleId, taskType, count, true, { warId });
}
}
else if (taskType == TASK_TYPE.BATTLE_TOWER)
{
if(dicWar.warType == WAR_TYPE.TOWER) {
pushMessage = await checkTask(roleId, taskType, count, true, {});
}
}
else if (taskType == TASK_TYPE.BATTLE_VESTIGE) {
if(dicWar.warType == WAR_TYPE.VESTIGE) {
pushMessage = await checkTask(roleId, taskType, count, true, {});
}
}
return pushMessage
}
// 根据taskType判断有哪些任务需要check的
export async function checkTask(roleId: string, taskType: number, count: number, isInc: boolean, param: TaskParam) {
let tasks = gameData.taskType.get(taskType);
@@ -279,6 +336,11 @@ export async function checkTaskRec(roleId: string, group: number, dicTask: DicTa
case TASK_TYPE.EQUIP_JEWEL_SUM:
case TASK_TYPE.FRIEND_NUM:
case TASK_TYPE.FRIEND_SEND_HEART:
case TASK_TYPE.BATTLE_MAIN_SWEEP:
case TASK_TYPE.BATTLE_DUNGEON:
case TASK_TYPE.BATTLE_TOWER_LV:
case TASK_TYPE.BATTLE_TOWER:
case TASK_TYPE.BATTLE_VESTIGE:
isMatch = true;
break;
case TASK_TYPE.HERO_STAR_UP:
@@ -317,9 +379,24 @@ export async function checkTaskRec(roleId: string, group: number, dicTask: DicTa
isMatch = param.stage == taskParam[1];
break;
case TASK_TYPE.CHAT:
isMatch = param.chatType == 0 || param.chatType == taskParam[0];
isMatch = taskParam[0] == 0 || param.chatType == taskParam[0];
break;
case TASK_TYPE.BATTLE_WITH_HERO:
isMatch = checkWarId(taskParam, 2, param.warId) && checkHero(taskParam, 0, param.heroes);
break;
case TASK_TYPE.BATTLE_MAIN:
case TASK_TYPE.BATTLE_DUNGEON_WAR:
isMatch = checkWarId(taskParam, 0, param.warId);
break;
case TASK_TYPE.BATTLE_EVENT:
isMatch = taskParam[0] == 0 || param.eventType == taskParam[0];
break;
case TASK_TYPE.BATTLE_DAILY_STAR:
isMatch = (taskParam[0] == 0 || param.star == taskParam[0]) && checkWarId(taskParam, 2, param.warId);
break;
case TASK_TYPE.BATTLE_DAILY:
isMatch = taskParam[0] == 0 || param.dailyType == taskParam[0];
break;
}
console.log('****isMatch', isMatch, type, taskType, group, count)
@@ -334,6 +411,24 @@ export async function checkTaskRec(roleId: string, group: number, dicTask: DicTa
}
}
/**
* 检查关卡id是否在条件中
* @param taskParam 条件number[] 填法 warcount&warid&... 有多少warid就warcount填几
* @param index warcount在第几位，0开始
* @param warId 关卡id
*/
function checkWarId(taskParam: number[], index: number, warId: number) {
let warCount = taskParam[index];
if(!warCount) return false;
let warIdList = taskParam.slice(index + 1, index + 1 + warCount);
return warIdList.indexOf(warId) != -1;
}
function checkHero(taskParam: number[], index: number, heroes: number[]) {
let hid = taskParam[index];
return heroes.indexOf(hid) != -1;
}
function checkRecResult(rec: UserTaskRecType, condition: number) {
if(!rec) return false;
if(rec.received) return false;