Merge branch 'version/v0.1' of gitlab.trgame.cn:zyztech/zyz_server

# Conflicts:
#	shared/resource/jsons/dic_api.json
This commit is contained in:
luying
2022-01-19 13:46:57 +08:00
27 changed files with 86 additions and 68 deletions

View File

@@ -557,7 +557,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
let taskRecord = await ActivityDailyChallengesModel.findDataByCellIndex(serverId, activity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType)
let recordData = taskRecord && taskRecord.data ? JSON.parse(taskRecord.data) : null
let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, activity.activityId, parma, recordData);
console.log('******* dailyChallenge', addCount, record)
// console.log('******* dailyChallenge', addCount, record)
if (addCount) {
if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE || taskType == TASK_TYPE.BATTLE_TOWER_LV || taskType == TASK_TYPE.FRIEND_NUM) {
let playerRecord = await ActivityDailyChallengesModel.setTaskCount(serverId, activity.activityId, roleId, task.dayIndex, task.cellIndex, task.taskType, addCount);