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

活动：修改更新活动

Browse Source
This commit is contained in:
luying
2021-12-18 18:04:59 +08:00
parent 1e5157bb79
commit 4613de7aa4
6 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game-server/app/servers/activity/remote/activityRemote.ts
View File

@@ -102,7 +102,9 @@ export class ActivityRemote {
public async saveActivitiesToGroup(groupId: number, activities: number[]) {
for(let activityId of activities) {
this.activities.get(activityId).groupId = groupId;
if(this.activities.get(activityId)) {
this.activities.get(activityId).groupId = groupId;
}
}
this.setActivityTypeAndServer();
}

5
game-server/app/servers/gm/handler/gmHandler.ts
View File

@@ -151,8 +151,8 @@ export class GmHandler {
});
}
let activities = await ActivityModel.findActivityByIds(aids);
let checkTimeResult = await checkActivityEditable(activities);
if(!checkTimeResult) return resResult(STATUS.GM_CAN_NOT_EDIT_ACT);
// let checkTimeResult = await checkActivityEditable(activities);
// if(!checkTimeResult) return resResult(STATUS.GM_CAN_NOT_EDIT_ACT);
let checkGroup = await checkActivityGroupTypeWithId(groupId, activities);
if(!checkGroup) return resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE);
@@ -176,6 +176,7 @@ export class GmHandler {
if (!result) {
return resResult(STATUS.ACTIVITY_MISSING);
}
await ActivityGroupModel.pullByActivityIds([activityId]);
let activityServers = pinus.app.getServersByType('activity');
for(let server of activityServers) {
pinus.app.rpc.activity.activityRemote.deleteActivities.toServer(server.id, [activityId]);

2
game-server/app/services/mailService.ts
View File

@@ -100,7 +100,7 @@ export class SendMailFun {
this.goods = params.goods||[];
}
getContent(content: string, params: string[]) {
getContent(content: string, params: string[] = []) {
if(!content) content = '%d';
for(let p of params) {
content = content.replace(/%d/, p);

4
gm-server/app/controller/login.ts
View File

@@ -11,9 +11,7 @@ export default class LoginController extends Controller {
public async currentUser() {
const { ctx } = this;
ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, {
"user": ctx.user
});
ctx.body = ctx.service.gmUser.currentUser();
}
public async changeMyPass() {

5
gm-server/app/service/GmUser.ts
View File

@@ -40,6 +40,11 @@ export default class GMUsers extends Service {
}
}
public async currentUser() {
const {ctx} = this;
}
/**
* 修改我的密码
*/

8
shared/pubUtils/taskUtil.ts
View File

@@ -495,10 +495,10 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
if(activities) {
let result: ActivityModelType[] = [];
for(let activity of activities) {
// getActivities -> activities 获取所有结束时间在当前以后的活动
// types: 活动类型
if(activityGroupId.includes(activity.groupId) && types.includes(activity.type)) {
result.push(activity);
if(activity.beginTime <= new Date() && activity.endTime >= new Date()) {
if(activityGroupId.includes(activity.groupId) && types.includes(activity.type)) {
result.push(activity);
}
}
}
return result;