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

活动：添加区服id表示

Browse Source
This commit is contained in:
qiaoxin
2021-05-15 18:32:51 +08:00
parent 909481df40
commit 498a846f91
10 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/selfServiceShopHandler.ts
+1 -1
View File
@@ -55,7 +55,7 @@ export class SelfServiceShopHandler {
let item = playerData.getItem(index);
if (item.countMax > 0) {//限制购买次数
let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByIndex(activityId, roleId, playerData.roundIndex, index);
let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByIndex(serverId, activityId, roleId, playerData.roundIndex, index);
if (playerRecords.length >= item.countMax) {
return resResult(STATUS.ACTIVITY_MAX_COUNT);
}
game-server/app/servers/activity/handler/thirtyDaysHandler.ts
+5 -4
View File
@@ -22,17 +22,18 @@ export class ThirtyDaysHandler {
/**
* @description 获取30目标活动数据
* @param {{ }} msg
* @param {{ activityId: number}} msg
* @param {BackendSession} session
* @memberof ThirtyDaysHandler
*/
async getThirtyDaysActivity(msg: {}, session: BackendSession) {
const { } = msg;
async getThirtyDaysActivity(msg: { activityId: number }, session: BackendSession) {
const { activityId } = msg;
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let todayIndex = await playerThirtyDaysActivityDays(roleId)
let playerData = await thirtyDaysActivity(ACTIVITY_TYPE.THIRTY_DAYS, serverId, roleId);
let playerData = await getPlayerThirtyDaysData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_THIRTY_DAYS_END);
return resResult(STATUS.SUCCESS, { playerData, todayIndex });
@@ -94,7 +95,7 @@ export class ThirtyDaysHandler {
return resResult(STATUS.ACTIVITY_TIME_ERROR);
}
await ActivityThirtyDaysModel.addRecord(activityId, roleId, pageIndex, cellIndex);
await ActivityThirtyDaysModel.addRecord(serverId, activityId, roleId, pageIndex, cellIndex);
let reward = thirtyDaysItemData.goodReward();
let goods = await addItems(roleId, roleName, sid, reward);
let heroReward = thirtyDaysItemData.heroReward();
game-server/app/services/rechargeMoneyService.ts
+1 -1
View File
@@ -17,7 +17,7 @@ import moment = require('moment');
*/
export async function rechargeMoneyActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.RECHARGEMONEY, new Date())
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
game-server/app/services/selfServiceShopActivityService.ts
+2 -2
View File
@@ -40,7 +40,7 @@ export async function getPlayerActivityData(activityId: number, serverId: number
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let playerData = new SelfServiceShopData(activityData);
let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByPriceType(activityId, roleId, playerData.roundIndex, ACTIVITY_RESOURCES_TYPE.RMB);
let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByPriceType(serverId, activityId, roleId, playerData.roundIndex, ACTIVITY_RESOURCES_TYPE.RMB);
playerData.setPlayerRecords(playerRecords);
@@ -76,6 +76,6 @@ export async function addSelfServiceShopGiftReward(roleId: string, roleName: str
}
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
//购买记录
await ActivitySelfServiceShopModel.addBuyRecord(activityId, roleId, roundIndex, index, price, priceType, goodsStr);
await ActivitySelfServiceShopModel.addBuyRecord(serverId, activityId, roleId, roundIndex, index, price, priceType, goodsStr);
return result
}
game-server/app/services/thirtyDaysService.ts
+2 -2
View File
@@ -42,7 +42,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
*/
export async function getPlayerThirtyDaysData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(activityId, roleId);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
let playerData = new ThirtyDaysData(activityData);
@@ -61,7 +61,7 @@ export async function getPlayerThirtyDaysData(activityId: number, serverId: numb
*/
export async function addPlayerThirtyDaysTask(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(activityId, roleId);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
let playerData = new ThirtyDaysData(activityData);