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

活动：添加rmb活动类型判断

Browse Source
This commit is contained in:
qiaoxin
2021-05-28 10:04:14 +08:00
parent 8679ca946d
commit a328f02b25
9 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/signInHandler.ts
+1 -1
View File
@@ -111,7 +111,7 @@ export class SignInHandler {
if (!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH);
}
await ActivitySignInModel.addSignInRecord(activityId, roleId, roundIndex, dayIndex);
await ActivitySignInModel.addSignInRecord(activityId, roleId, roundIndex, [dayIndex]);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(signinItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
game-server/app/services/dailyRMBGiftsService.ts
+3
View File
@@ -71,6 +71,9 @@ export async function getPlayerDailyGiftsData(activityId: number, serverId: numb
export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.RECHARGE_MONEY) {
return null;
}
let playerData = new DailyRMBGiftsData(activityData);
let bigGiftProductID = playerData.productID;
if (bigGiftProductID == productID) {//一次性购买7天礼包
game-server/app/services/growthFundService.ts
+3
View File
@@ -126,6 +126,9 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
export async function makeGrowthFund(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP && activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP && activityData.type !== ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP) {
return null;
}
if (!activityData) {
return null;
}
game-server/app/services/monthlyTicketService.ts
+4
View File
@@ -114,6 +114,10 @@ export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName:
export async function makeMonthlyTicketReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.MONTHLY_TICKET_1 && activityData.type !== ACTIVITY_TYPE.MONTHLY_TICKET_2) {
return null;
}
let playerData = new MonthlyTicketData(activityData);
let endTime = moment(new Date()).startOf('d').add(playerData.days, 'day').toDate();
game-server/app/services/popUpShopService.ts
+3
View File
@@ -71,6 +71,9 @@ export async function makePopUpShopReward(roleId: string, roleName: string, sid:
if (!activityData) {
return null;
}
if (activityData.type !== ACTIVITY_TYPE.POP_UP_SHOP) {
return null;
}
let allTaskData: any[] = JSON.parse(activityData.data);
let taskIndex = allTaskData.findIndex(obj => { return obj && obj.data.productID == productID });
if (taskIndex == -1) {
game-server/app/services/signInService.ts
+9 -3
View File
@@ -27,7 +27,7 @@ export async function signInActivity(serverId: number, roleId: string) {
}
let activityData = activityArray[0];
let playerData = new SignInData(activityData);
let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
playerData.setPlayerRecords(playerRecords);
return playerData;
}
@@ -54,7 +54,7 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
}
let activityData = activityArray[0];
let playerData = new SignInData(activityData);
let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
playerData.setPlayerRecords(playerRecords);
return playerData;
}
@@ -69,8 +69,11 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
*/
export async function getPlayerSignInData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.SIGN_IN_VIP && activityData.type !== ACTIVITY_TYPE.SIGN_IN) {
return null;
}
let playerData = new SignInData(activityData);
let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
playerData.setPlayerRecords(playerRecords);
@@ -90,6 +93,9 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
export async function makeSignInVIP(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.SIGN_IN_VIP) {
return null;
}
let playerData = new SignInData(activityData);
await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex);
game-server/app/services/yuanbaoService.ts
+3
View File
@@ -59,6 +59,9 @@ export async function makeYuanbaoShopReward(roleId: string, roleName: string, si
activityId: number, productID: string) {
let records = await UserOrderModel.findSuccessOrderByProductID(productID, roleId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.YUAN_BAO_SHOP) {
return null;
}
let playerData = new YuanBaoShopData(activityData);
let item = playerData.findItem(productID);