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

活动：修改bug

Browse Source
This commit is contained in:
qiaoxin
2021-06-01 11:08:11 +08:00
parent c98c1f5170
commit 9a45e182cf
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/domain/activityField/popUpShopField.ts
+3 -1
View File
@@ -1,8 +1,9 @@
import { ACTIVITY_TYPE } from "../../consts";
import { ActivityPopUpShopModelType } from "../../db/ActivityPopUpShop"; import { ActivityPopUpShopModelType } from "../../db/ActivityPopUpShop";
// 弹框商店 // 弹框商店
export class PopUpShopData { export class PopUpShopData {
type: number//活动类型
activityId: number; // 活动id activityId: number; // 活动id
id: number; // 第几个，从1开始 id: number; // 第几个，从1开始
name: string; //名字 name: string; //名字
@@ -34,6 +35,7 @@ export class PopUpShopData {
public initData(data: any) { public initData(data: any) {
this.type = ACTIVITY_TYPE.POP_UP_SHOP;
this.id = data.id; this.id = data.id;
this.reward = data.reward; this.reward = data.reward;
this.consume = data.consume ? data.consume : ''; this.consume = data.consume ? data.consume : '';
shared/pubUtils/taskUtil.ts
+15 -13
View File
@@ -575,20 +575,22 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
for (let activity of allActivity) { for (let activity of allActivity) {
let allTaskData: any[] = JSON.parse(activity.data); let allTaskData: any[] = JSON.parse(activity.data);
for (let task of allTaskData) { for (let task of allTaskData) {
let popShopData = new PopUpShopData(task, activity.activityId); if (task.taskType == taskType) {
let taskRecord = await ActivityPopUpShopModel.findOpenDataByTaskId(serverId, activity.activityId, roleId, popShopData.id, popShopData.taskType) let popShopData = new PopUpShopData(task, activity.activityId);
let recordData = taskRecord && taskRecord.data ? JSON.parse(taskRecord.data) : null let taskRecord = await ActivityPopUpShopModel.findOpenDataByTaskId(serverId, activity.activityId, roleId, popShopData.id, popShopData.taskType)
if (!taskRecord || !taskRecord.isBuy) { let recordData = taskRecord && taskRecord.data ? JSON.parse(taskRecord.data) : null
let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, parma, recordData); if (!taskRecord || !taskRecord.isBuy) {
if (addCount) { let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, parma, recordData);
if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE) { if (addCount) {
await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount); if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE) {
} else { await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount);
await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount); } else {
await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount);
}
}
if (record) {
await ActivityPopUpShopModel.addTaskRecord(serverId, activity.activityId, roleId, task.id, task.taskType, JSON.stringify(record));
} }
}
if (record) {
await ActivityPopUpShopModel.addTaskRecord(serverId, activity.activityId, roleId, task.id, task.taskType, JSON.stringify(record));
} }
} }
} }