From f02161701c4ff79e6369bc680b6a1bab15674b56 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 20 Dec 2021 09:44:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=9A=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/gm/handler/gmHandler.ts | 6 +++--- shared/db/Activity.ts | 8 +++++--- shared/resource/jsons/dic_army_bossBase.json | 20 +++++++++---------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts index 3df1454e4..9a913fe55 100644 --- a/game-server/app/servers/gm/handler/gmHandler.ts +++ b/game-server/app/servers/gm/handler/gmHandler.ts @@ -136,8 +136,8 @@ export class GmHandler { }); } - async updateActivity(msg: { activityId: number|string, groupId: number, beginTime: number, endTime: number, type: number, data: string }, session: BackendSession) { - const { activityId, groupId, beginTime, endTime, type, data } = msg; + async updateActivity(msg: { activityId: number|string, groupId: number, beginTime: number, endTime: number, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number }, session: BackendSession) { + const { activityId, groupId, beginTime, endTime, type, data, timeType = 3, days = 0, delayDay = 0, interval = 0 } = msg; const uid = session.get('uid'); if (!type || !data) { return resResult(STATUS.WRONG_PARMS); @@ -156,7 +156,7 @@ export class GmHandler { let checkGroup = await checkActivityGroupTypeWithId(groupId, activities); if(!checkGroup) return resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE); - activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, uid); + activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, timeType, days, delayDay, interval, uid); let activityServers = pinus.app.getServersByType('activity'); for(let server of activityServers) { diff --git a/shared/db/Activity.ts b/shared/db/Activity.ts index 57b4e7e3b..1669a66a8 100644 --- a/shared/db/Activity.ts +++ b/shared/db/Activity.ts @@ -75,11 +75,13 @@ export default class Activity extends BaseModel { } //新增活动 - public static async addActivity(aids: number[], groupId: number, beginTime: Date, endTime: Date, type: number, data: string, uid = 1) { + public static async addActivity(aids: number[], groupId: number, beginTime: Date, endTime: Date, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, uid = 1) { let result: ActivityModelType[] = []; + let newAids = []; for (let activityId of aids) { if (!activityId) activityId = await CounterModel.getNewCounter(COUNTER.ACTIVITY); - let update = { type, data } + newAids.push(activityId); + let update = { type, data, timeType, days, delayDay, interval } if (beginTime != undefined) { update["beginTime"] = beginTime; } @@ -95,7 +97,7 @@ export default class Activity extends BaseModel { let newGroup = await ActivityGroupModel.createGroup(uid); groupId = newGroup.groupId; } - await ActivityGroupModel.addActivitiesToGroupData(groupId, aids, uid); + await ActivityGroupModel.addActivitiesToGroupData(groupId, newAids, uid); } return result; } diff --git a/shared/resource/jsons/dic_army_bossBase.json b/shared/resource/jsons/dic_army_bossBase.json index bd83ba115..4e19c1f0c 100644 --- a/shared/resource/jsons/dic_army_bossBase.json +++ b/shared/resource/jsons/dic_army_bossBase.json @@ -12,7 +12,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1000", "ratio": 1, - "damageRewardTotal": "40005&1000", + "damageReward": "40005&1000", "basicReward": "17052&2", "encourageSum": 300, "rewardsPreview": "21013&80|21016&80|21031&80|21054&80|21055&80|21062&80|21063&80|21008&60|21010&60|42124&1|42128&1|42132&1|42136&1|42140&1|42144&1" @@ -30,7 +30,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1200", "ratio": 1, - "damageRewardTotal": "40005&1200", + "damageReward": "40005&1200", "basicReward": "17052&4", "encourageSum": 300, "rewardsPreview": "21013&80|21016&80|21031&80|21054&80|21055&80|21062&80|21063&80|21008&60|21010&60|42124&1|42128&1|42132&1|42136&1|42140&1|42144&1" @@ -48,7 +48,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1300", "ratio": 1, - "damageRewardTotal": "40005&1300", + "damageReward": "40005&1300", "basicReward": "17052&6", "encourageSum": 300, "rewardsPreview": "21013&80|21016&80|21031&80|21054&80|21055&80|21062&80|21063&80|21008&60|21010&60|42124&1|42128&1|42132&1|42136&1|42140&1|42144&1" @@ -66,7 +66,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1400", "ratio": 1, - "damageRewardTotal": "40005&1400", + "damageReward": "40005&1400", "basicReward": "17052&8", "encourageSum": 300, "rewardsPreview": "42136&1|42140&1|42144&1|33123&1|33127&1|33131&1|33135&1|33139&1|33143&1" @@ -84,7 +84,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1500", "ratio": 1, - "damageRewardTotal": "40005&1500", + "damageReward": "40005&1500", "basicReward": "17052&10", "encourageSum": 300, "rewardsPreview": "42136&1|42140&1|42144&1|33123&1|33127&1|33131&1|33135&1|33139&1|33143&1" @@ -102,7 +102,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1600", "ratio": 1, - "damageRewardTotal": "40005&1600", + "damageReward": "40005&1600", "basicReward": "17052&12", "encourageSum": 300, "rewardsPreview": "42136&1|42140&1|42144&1|33123&1|33127&1|33131&1|33135&1|33139&1|33143&1" @@ -120,7 +120,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1700", "ratio": 1, - "damageRewardTotal": "40005&1700", + "damageReward": "40005&1700", "basicReward": "17052&14", "encourageSum": 300, "rewardsPreview": "33131&1|33135&1|33139&1|33143&1|50169&1|50170&1|50171&1" @@ -138,7 +138,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1800", "ratio": 1, - "damageRewardTotal": "40005&1800", + "damageReward": "40005&1800", "basicReward": "17052&16", "encourageSum": 300, "rewardsPreview": "33131&1|33135&1|33139&1|33143&1|50169&1|50170&1|50171&1" @@ -156,7 +156,7 @@ "imageName": "jttubiao_3", "killReward": "40005&1900", "ratio": 1, - "damageRewardTotal": "40005&1900", + "damageReward": "40005&1900", "basicReward": "17052&18", "encourageSum": 300, "rewardsPreview": "33131&1|33135&1|33139&1|33143&1|50169&1|50170&1|50171&1" @@ -174,7 +174,7 @@ "imageName": "jttubiao_3", "killReward": "40005&2000", "ratio": 1, - "damageRewardTotal": "40005&2000", + "damageReward": "40005&2000", "basicReward": "17052&20", "encourageSum": 300, "rewardsPreview": "33131&1|33135&1|33139&1|33143&1|50169&1|50170&1|50171&1"