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

活动：任务接口添加serverId接口

Browse Source
This commit is contained in:
qiaoxin
2021-05-20 19:25:52 +08:00
parent d637e5701d
commit 718f19a42a
39 changed files with 481 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/dailyChallengesService.ts
+1 -1
View File
@@ -12,7 +12,7 @@ import { DailyChallengesData, DailyItem } from '../domain/activityField/dailyCha
*
*/
export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
let playerData = new DailyChallengesData(activityData);
game-server/app/services/dailyGiftsService.ts
+1 -1
View File
@@ -12,7 +12,7 @@ import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGift
*
*/
export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
let playerData = new DailyGiftsData(activityData);
game-server/app/services/dailyRMBGiftsService.ts
+3 -3
View File
@@ -18,7 +18,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
*/
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
@@ -41,7 +41,7 @@ export async function thirtyDaysActivity(type: number, serverId: number, roleId:
*
*/
export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new DailyRMBGiftsData(activityData);
let productID = playerData.productID;
@@ -70,7 +70,7 @@ 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, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new DailyRMBGiftsData(activityData);
let bigGiftProductID = playerData.productID;
if (bigGiftProductID == productID) {//一次性购买7天礼包
game-server/app/services/equipService.ts
+4 -4
View File
@@ -58,7 +58,7 @@ export function checkMaterialEnough(consumes: Array<{ id: number, count: number
* @param id 装备类型
* @param seqId 要装上的装备的唯一id 装备B
*/
export async function changeEquip(roleId: string, sid: string, equipA: EquipType, hid: number, id: number, equipB: EquipType, funcs: number[]) {
export async function changeEquip(serverId: number, roleId: string, sid: string, equipA: EquipType, hid: number, id: number, equipB: EquipType, funcs: number[]) {
let heroB: HeroType;
if (!!hid) //需要卸下或者替换的武将
heroB = await HeroModel.findByHidAndRoleWithEquip(hid, roleId);//需要替换的武将
@@ -77,7 +77,7 @@ export async function changeEquip(roleId: string, sid: string, equipA: EquipType
let res = await takeOffEquipAndCalPlayerCe(roleId, sid, heroB, equipB, id, funcs);//卸下装备并重算战力
return res;
}
let res = await dressEquip(roleId, sid, heroB, equipA, funcs);//替换给武将，并计算战力
let res = await dressEquip(serverId, roleId, sid, heroB, equipA, funcs);//替换给武将，并计算战力
return res;
} else {
let res = await takeOffEquipAndCalPlayerCe(roleId, sid, null, equipA, id, funcs);//卸下装备并重算战力
@@ -119,7 +119,7 @@ export async function takeOffEquipAndCalPlayerCe(roleId: string, sid: string, he
* @param hero
* @param equip
*/
export async function dressEquip(roleId: string, sid: string, hero: HeroType, equip: EquipType, funcs: number[]) {
export async function dressEquip(serverId: number, roleId: string, sid: string, hero: HeroType, equip: EquipType, funcs: number[]) {
let args = calEquipSeids(hero);
hero = await HeroModel.addEquip(roleId, hero.hid, equip.ePlaceId, equip._id);
@@ -129,7 +129,7 @@ export async function dressEquip(roleId: string, sid: string, hero: HeroType, eq
await checkTask(roleId, sid, funcs, TASK_TYPE.EQUIP_SUM, 1, true, {});
await checkTaskWithHero(roleId, sid, funcs, TASK_TYPE.EQUIP_BY_HERO, hero, [1]);
await checkTaskWithEquip(roleId, sid, funcs, TASK_TYPE.EQUIP_QUALITY, equip, [1]);
await accomplishTask(roleId, TASK_TYPE.EQUIP_QUALITY, 1, { quality: equip.quality })
await accomplishTask(serverId, roleId, TASK_TYPE.EQUIP_QUALITY, 1, { quality: equip.quality })
return { seqId: equip.seqId, hid: hero.hid };
}
game-server/app/services/firstGiftService.ts
+2 -2
View File
@@ -13,7 +13,7 @@ import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftF
*/
export async function firstGiftActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.FIRST_GIFT, true)
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
@@ -34,7 +34,7 @@ export async function firstGiftActivity(serverId: number, roleId: string) {
*
*/
export async function getPlayerFirstGiftData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityId, roleId);
let playerData = new FirstGiftData(activityData);
game-server/app/services/gachaService.ts
+51 -51
View File
@@ -13,11 +13,11 @@ import { gameData, getDicGachaFloor } from "../pubUtils/data";
* @param roleId 玩家id
* @param aid 活动id
*/
export async function getLimitGacha(roleId: string, activityId: number) {
let activityData = await ActivityModel.findActivity(activityId, true);
if(!activityData) return false;
export async function getLimitGacha(serverId: number, roleId: string, activityId: number) {
let activityData = await ActivityModel.findActivity(serverId, activityId, true);
if (!activityData) return false;
let gachaData = new GachaData(activityData);
let userGacha = await UserGachaModel.findByRole(roleId, gachaData.gachaId, activityId);
userGacha = await refreshGacha(gameData.gacha.get(gachaData.gachaId), userGacha);
@@ -33,17 +33,17 @@ export async function getLimitGacha(roleId: string, activityId: number) {
export async function refreshGacha(dicGacha: DicGacha, userGacha: UserGachaType) {
let { day, count } = dicGacha.free;
if(count <= 0) {
if (count <= 0) {
return userGacha;
}
let { roleId, gachaId, refFreeTime, refHopeTime, hope } = userGacha;
if(shouldRefresh(refFreeTime, new Date(), REFRESH_TIME, day)) {
if (shouldRefresh(refFreeTime, new Date(), REFRESH_TIME, day)) {
let ref = <Date>getTimeFunD().getAfterDayByGap(refFreeTime, day);
userGacha = await UserGachaModel.refreshFreeCount(roleId, gachaId, 0, ref);
}
if(shouldRefresh(refHopeTime, new Date(), REFRESH_TIME)) {
hope = hope.map(cur => { return { ...cur, hasGet: false}});
if (shouldRefresh(refHopeTime, new Date(), REFRESH_TIME)) {
hope = hope.map(cur => { return { ...cur, hasGet: false } });
let ref = getZeroPointD();
userGacha = await UserGachaModel.refreshHopeCount(roleId, gachaId, 0, hope, ref);
}
@@ -58,24 +58,24 @@ export async function refreshGacha(dicGacha: DicGacha, userGacha: UserGachaType)
*/
export function getFloorResult(gachaId: number, base: number, floor: Floor[]) {
let dicGachaContent = gameData.gachaContent.get(base); // 普通随机得出的结果是哪一类；
if(!dicGachaContent) {
if (!dicGachaContent) {
console.error('dic_zyz_gachaContent error');
return false; // DIC_NOT_FOUND 直接报错
}
let touchedFloor = 0, touchedHeroQuality: number; // 触发的保底的id
let dicFloorType = GACHA_TO_FLOOR.get(gachaId);
for(let id of dicFloorType) {
for (let id of dicFloorType) {
let { type, param } = dicGachaContent;
let heroQuality = getHeroQuality(id);
if(heroQuality == false) continue;
if (heroQuality == false) continue;
let isTarget = type == GACHA_CONTENT_TYPE.HERO && param[0] == heroQuality;
if(!isTarget) { // 触发保底
if (!isTarget) { // 触发保底
let percent = countFloorPercent(id, floor);
let rand = Math.random();
if(rand < percent) { // 可以替换为保底
if(touchedFloor > 0 && touchedFloor < id) { // 如果已经触发过保底了
if (rand < percent) { // 可以替换为保底
if (touchedFloor > 0 && touchedFloor < id) { // 如果已经触发过保底了
// 更新被覆盖掉的那个保底数量
updateUserFloor(floor, touchedFloor, false);
}
@@ -88,8 +88,8 @@ export function getFloorResult(gachaId: number, base: number, floor: Floor[]) {
updateUserFloor(floor, id, true);
}
}
if(touchedFloor > 0) {
if (touchedFloor > 0) {
updateUserFloor(floor, touchedFloor, true);
return gameData.gachaContentHero.get(touchedHeroQuality);
} else {
@@ -105,14 +105,14 @@ export function getFloorResult(gachaId: number, base: number, floor: Floor[]) {
*/
function updateUserFloor(floor: Floor[], id: number, needReset: boolean) {
let curFloor = floor.find(cur => cur.id == id);
if(!curFloor) {
if (!curFloor) {
curFloor = { id, count: 0 };
floor.push(curFloor);
}
if(needReset) {
if (needReset) {
curFloor.count = 0;
} else {
curFloor.count ++;
curFloor.count++;
}
}
@@ -123,7 +123,7 @@ function updateUserFloor(floor: Floor[], id: number, needReset: boolean) {
*/
function countFloorPercent(id: number, floor: Floor[]) {
let curFloor = floor.find(cur => cur.id == id);
let count = curFloor?curFloor.count: 0;
let count = curFloor ? curFloor.count : 0;
// 保底概率，暂时使用线性公式，由策划使用后选择
let floorCount = getDicGachaFloor(id);
return count / floorCount;
@@ -134,11 +134,11 @@ function countFloorPercent(id: number, floor: Floor[]) {
* @param id 保底类型id in GACHA_FLOOR_TYPE
*/
function getHeroQuality(id: number) {
if(id == GACHA_FLOOR_TYPE.PURPLE) {
if (id == GACHA_FLOOR_TYPE.PURPLE) {
return HERO_QUALITY_TYPE.PURPLE;
} else if (id == GACHA_FLOOR_TYPE.GOLD) {
return HERO_QUALITY_TYPE.GOLD;
} else if ( id == GACHA_FLOOR_TYPE.ASSIGN) {
} else if (id == GACHA_FLOOR_TYPE.ASSIGN) {
return 0
} else {
return false;
@@ -154,7 +154,7 @@ function getHeroQuality(id: number) {
export function getResultFromContentId(contentId: number, lv: number, hope: Hope[]) {
let dic = gameData.gachaContent.get(contentId);
let { type, param, count } = dic;
if(type == GACHA_CONTENT_TYPE.HERO) {
if (type == GACHA_CONTENT_TYPE.HERO) {
let pool: number[] = getPoolByHope(hope, param[0]);
let hero = getRandEelm(pool);
@@ -163,7 +163,7 @@ export function getResultFromContentId(contentId: number, lv: number, hope: Hope
return result
} else {
let pool: number[] = [];
if(type == GACHA_CONTENT_TYPE.HERO_PIECE) {
if (type == GACHA_CONTENT_TYPE.HERO_PIECE) {
pool = getAllItemByQuality(IT_TYPE.HERO_PIECE, param[0], lv);
} else if (type == GACHA_CONTENT_TYPE.BLUEPRT) {
pool = getAllItemByQuality(IT_TYPE.BLUEPRT, param[0], lv);
@@ -187,29 +187,29 @@ export function getResultFromContentId(contentId: number, lv: number, hope: Hope
* @param qualtiy 武将品质
*/
function getPoolByHope(hope: Hope[], qualtiy: number) {
if(qualtiy == HERO_QUALITY_TYPE.GOLD) {
if (qualtiy == HERO_QUALITY_TYPE.GOLD) {
let hopeMap = new Map<number, Hope>();
let hasGetHope: number[] = [];
for(let h of hope) {
if(h.hid > 0) {
for (let h of hope) {
if (h.hid > 0) {
hopeMap.set(h.id, h);
if(h.hasGet) hasGetHope.push(h.id);
if (h.hasGet) hasGetHope.push(h.id);
}
}
let list = gameData.gachaHope.map(cur => {
return {...cur, hasGet: hopeMap.get(cur.id)?.hasGet||false};
return { ...cur, hasGet: hopeMap.get(cur.id)?.hasGet || false };
})
let { dic: { id, hasGet } } = getRandEelmWithWeight(list);
if(id == 0 || hasGet) {
return getAllHeroByQuality(qualtiy).filter(cur => !hasGetHope.includes(cur) );
if (id == 0 || hasGet) {
return getAllHeroByQuality(qualtiy).filter(cur => !hasGetHope.includes(cur));
} else {
if(hopeMap.has(id)) {
if (hopeMap.has(id)) {
let curHope = hopeMap.get(id);
curHope.hasGet = true;
return [curHope.hid];
} else {
return getAllHeroByQuality(qualtiy).filter(cur => !hasGetHope.includes(cur) );
return getAllHeroByQuality(qualtiy).filter(cur => !hasGetHope.includes(cur));
}
}
} else {
@@ -222,20 +222,20 @@ function getPoolByHope(hope: Hope[], qualtiy: number) {
* @param quality 品质
*/
export function getAllHeroByQuality(quality: number) {
if(quality == 0) return [ GACHA_OCCUPY_HID ];
if (quality == 0) return [GACHA_OCCUPY_HID];
let allHero: number[] = [];
let allQuality: number[] = [];
for(let { actorId } of gameData.recruit) {
for (let { actorId } of gameData.recruit) {
let dicHero = gameData.hero.get(actorId);
if(dicHero.quality == quality) {
if (dicHero.quality == quality) {
allHero.push(actorId);
}
if(allQuality.indexOf(dicHero.quality) == -1) allQuality.push(dicHero.quality);
if (allQuality.indexOf(dicHero.quality) == -1) allQuality.push(dicHero.quality);
}
allQuality.sort((a, b) => a - b);
if(allQuality.length == 0) return [];
if(allHero.length == 0) {
if (allQuality.length == 0) return [];
if (allHero.length == 0) {
allHero = getAllHeroByQuality(allQuality[0]);
}
return allHero;
@@ -243,9 +243,9 @@ export function getAllHeroByQuality(quality: number) {
function getAllItemByQuality(itid: number, quality: number, lv: number) {
let allPiece: number[] = [];
for(let [ id, dicGoods ] of gameData.goods) {
if(dicGoods.itid == itid) {
if((quality == 0 || dicGoods.quality == quality) || dicGoods.lvLimited <= lv) {
for (let [id, dicGoods] of gameData.goods) {
if (dicGoods.itid == itid) {
if ((quality == 0 || dicGoods.quality == quality) || dicGoods.lvLimited <= lv) {
allPiece.push(id);
}
}
@@ -255,13 +255,13 @@ function getAllItemByQuality(itid: number, quality: number, lv: number) {
function getAllJewelByLv(lv: number) {
let itids: number[] = [];
for(let [ id, { type } ] of ITID) {
if(type == CONSUME_TYPE.JEWEL) itids.push(id);
for (let [id, { type }] of ITID) {
if (type == CONSUME_TYPE.JEWEL) itids.push(id);
}
let items: number[] = [];
for(let [ id, dicGoods ] of gameData.goods) {
if(itids.includes(dicGoods.itid)) {
if(lv == 0 || dicGoods.lvLimited == lv) {
for (let [id, dicGoods] of gameData.goods) {
if (itids.includes(dicGoods.itid)) {
if (lv == 0 || dicGoods.lvLimited == lv) {
items.push(id);
}
}
@@ -271,9 +271,9 @@ function getAllJewelByLv(lv: number) {
function getSuitPaper(lv: number) {
let items: number[] = [];
for(let [ id, dicGoods ] of gameData.goods) {
if(dicGoods.itid == IT_TYPE.PAPER) {
if(dicGoods.lvLimited <= lv) {
for (let [id, dicGoods] of gameData.goods) {
if (dicGoods.itid == IT_TYPE.PAPER) {
if (dicGoods.lvLimited <= lv) {
items.push(id);
}
}
game-server/app/services/growthFundService.ts
+2 -2
View File
@@ -22,7 +22,7 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
*/
export async function growthFundActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
@@ -45,7 +45,7 @@ export async function growthFundActivity(type: number, serverId: number, roleId:
*
*/
export async function getPlayerGrowthFundData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityGrowthFundModelType[] = await ActivityGrowthFundModel.findData(activityId, roleId);
let playerData = new GrowthFundData(activityData);
game-server/app/services/growthService.ts
+4 -3
View File
@@ -1,3 +1,4 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityGrowthModel, ActivityGrowthModelType } from '../db/ActivityGrowth';
import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
@@ -10,8 +11,8 @@ import { GrowthData, GrowthItem } from '../domain/activityField/growthField';
* @param {string} roleId 角色Id
*
*/
export async function getActivityData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
export async function getGrowthActivityData(serverId: number, roleId: string) {
let activityData: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
return { data: activityData };
}
@@ -24,7 +25,7 @@ export async function getActivityData(activityId: number, serverId: number, role
*
*/
export async function getPlayerGrowthData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityGrowthModelType[] = await ActivityGrowthModel.findData(serverId, activityId, roleId);
let playerData = new GrowthData(activityData);
game-server/app/services/guildService.ts
+1 -1
View File
@@ -93,7 +93,7 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol
}
//成长任务-加入军团
await accomplishTask(roleId, TASK_TYPE.GUILD_JOIN, 1);
await accomplishTask(serverId, roleId, TASK_TYPE.GUILD_JOIN, 1);
session.set('guildCode', code);
session.push('guildCode', () => { });
game-server/app/services/limitPackageService.ts
+3 -3
View File
@@ -13,7 +13,7 @@ import { LimitShopData, ShopItem } from '../domain/activityField/limitShopField'
*/
export async function newPlayerLimitPackageActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, new Date)
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, new Date)
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
@@ -34,7 +34,7 @@ export async function newPlayerLimitPackageActivity(serverId: number, roleId: st
*
*/
export async function getPlayerLimitPackageData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new LimitShopData(activityData);
let playerRecord: ActivityShopModelType = await ActivityShopModel.findData(activityId, roleId, playerData.roundIndex);
@@ -53,7 +53,7 @@ export async function getPlayerLimitPackageData(activityId: number, serverId: nu
*/
export async function limitPackageActivity(serverId: number, roleId: string, type: number) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date)
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date)
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
game-server/app/services/monthlyTicketService.ts
+4 -4
View File
@@ -16,7 +16,7 @@ import moment = require('moment');
*/
export async function monthlyTicketActivity(serverId: number, roleId: string, type: number) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date())
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date())
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
@@ -37,7 +37,7 @@ export async function monthlyTicketActivity(serverId: number, roleId: string, ty
*
*/
export async function getPlayerMonthlyTicketData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
let playerData = new MonthlyTicketData(activityData);
playerData.setPlayerRecords(playerRecord);
@@ -54,7 +54,7 @@ export async function getPlayerMonthlyTicketData(activityId: number, serverId: n
*/
export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number,) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityMonthlyTicketModelType = await ActivityMonthlyTicketModel.findMonthlyTicket(serverId, roleId, activityId);
if (!playerRecord) {//没有购买过
return null;
@@ -84,7 +84,7 @@ 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, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new MonthlyTicketData(activityData);
let endTime = moment(new Date()).startOf('d').add(playerData.days, 'day').toDate();
game-server/app/services/normalBattleService.ts
+3 -2
View File
@@ -12,6 +12,7 @@ import { checkTask } from './taskService';
import { accomplishTask } from '../pubUtils/taskUtil';
export async function roleLevelup(roleId: string, kingExp: number, session: BackendSession) {
const serverId = session.get('serverId');
let role = await RoleModel.findByRoleId(roleId);
let { lv = 1, exp = 0 } = role;
let canGetExp = lv < gameData.maxPlayerLv; // 当主公超过最大级后，挑战结算不再获得经验值
@@ -35,10 +36,10 @@ export async function roleLevelup(roleId: string, kingExp: number, session: Back
// 任务
await checkTask(roleId, session.get('sid'), session.get('funcs'), TASK_TYPE.ROLE_LV, newLv, false, {});
//成长任务
await accomplishTask(roleId, TASK_TYPE.ROLE_LV, newLv);
await accomplishTask(serverId, roleId, TASK_TYPE.ROLE_LV, newLv);
}
let actordata: {lv: number, exp: number, getExp: number, mostExp: number}[] = [];
let actordata: { lv: number, exp: number, getExp: number, mostExp: number }[] = [];
for (let i = lv; i <= newLv; i++) {
let lvObj = getExpByLv(i);
game-server/app/services/popUpShopService.ts
+3 -3
View File
@@ -15,7 +15,7 @@ import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../db/Activi
*/
export async function popUpShopActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.POP_UP_SHOP, new Date())
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.POP_UP_SHOP, new Date())
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
@@ -36,7 +36,7 @@ export async function popUpShopActivity(serverId: number, roleId: string) {
*
*/
export async function getPlayerPopUpShopData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityPopUpShopModelType[] = await ActivityPopUpShopModel.findAllOpenData(serverId, activityId, roleId);
let allPlayerShop = [];
@@ -65,7 +65,7 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
*/
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
if (!activityData) {
return null;
}
game-server/app/services/rechargeMoneyService.ts
+2 -2
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.RECHARGE_MONEY, new Date())
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
@@ -38,7 +38,7 @@ export async function rechargeMoneyActivity(serverId: number, roleId: string) {
*
*/
export async function getPlayerRechargeMoneyData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: ActivityRechargeMoneyModelType[] = await ActivityRechargeMoneyModel.findData(serverId, roleId);
let playerData = new RechargeMoneyData(activityData);
game-server/app/services/selfServiceShopActivityService.ts
+2 -2
View File
@@ -16,7 +16,7 @@ import { addReward, getSelectedReward } from './giftPackageService';
*
*/
export async function getActivityData(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.SELF_SERVICE_SHOP, new Date())
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.SELF_SERVICE_SHOP, new Date())
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
@@ -37,7 +37,7 @@ export async function getActivityData(serverId: number, roleId: string) {
*
*/
export async function getPlayerActivityData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new SelfServiceShopData(activityData);
let playerRecords: ActivitySelfServiceShopModelType[] = await ActivitySelfServiceShopModel.findDataByPriceType(serverId, activityId, roleId, playerData.roundIndex, ACTIVITY_RESOURCES_TYPE.RMB);
game-server/app/services/signInService.ts
+3 -3
View File
@@ -14,7 +14,7 @@ import { SignInData, SignInItem } from '../domain/activityField/signInField';
*
*/
export async function signInActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(type, new Date());
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date());
if (activityArray.length > 0) {
return activityArray[0];
}
@@ -30,7 +30,7 @@ export async function signInActivity(type: number, serverId: number, roleId: str
*
*/
export async function getPlayerSignInData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new SignInData(activityData);
let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
@@ -51,7 +51,7 @@ 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, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new SignInData(activityData);
await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex);
game-server/app/services/taskService.ts
+6 -6
View File
@@ -16,16 +16,16 @@ import { gameData, getGoodById } from '../pubUtils/data';
import { getSeconds, getZeroPointD } from '../pubUtils/timeUtil';
import { RoleStatus } from '../db/ComBattleTeam';
export async function checkTaskWithRoles(roleId: string, sid: string, funcs: number[], taskType: number, roles: RoleType[]) {
export async function checkTaskWithRoles(serverId: number, roleId: string, sid: string, funcs: number[], taskType: number, roles: RoleType[]) {
for (let role of roles) {
if (role) {
await checkTaskWithRole(role.roleId, role.roleId == roleId ? sid : null, role.roleId == roleId ? funcs : null, taskType, role);
await checkTaskWithRole(serverId, role.roleId, role.roleId == roleId ? sid : null, role.roleId == roleId ? funcs : null, taskType, role);
}
}
}
export async function checkTaskWithRole(roleId: string, sid: string, funcs: number[], taskType: number, role: RoleType) {
let pushMessage = await taskUtil.checkTaskWithRole(roleId, taskType, role, funcs);
export async function checkTaskWithRole(serverId: number, roleId: string, sid: string, funcs: number[], taskType: number, role: RoleType) {
let pushMessage = await taskUtil.checkTaskWithRole(serverId, roleId, taskType, role, funcs);
pushTaskUpdate(roleId, sid, funcs, pushMessage);
}
@@ -76,7 +76,7 @@ export async function pushTaskUpdate(roleId: string, sid: string, funcs: number[
/**
* battle.normalBattleHandler.battleEnd 中会触发的任务，因为有点多提出来了
*/
export async function checkTaskInBattleEnd(roleId: string, sid: string, funcs: number[], battleId: number, heroes: number[], star: number) {
export async function checkTaskInBattleEnd(serverId: number, roleId: string, sid: string, funcs: number[], battleId: number, heroes: number[], star: number) {
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_WITH_HERO, battleId, heroes, 1, star);
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_MAIN, battleId, heroes, 1, star);
@@ -88,7 +88,7 @@ export async function checkTaskInBattleEnd(roleId: string, sid: string, funcs: n
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_VESTIGE, battleId, heroes, 1, star);
await checkTaskWithWar(roleId, sid, funcs, TASK_TYPE.BATTLE_EXPEDITION, battleId, heroes, 1, star);
//成长任务
await taskUtil.accomplishTask(roleId, TASK_TYPE.BATTLE_MAIN, 1, { warId: battleId })
await taskUtil.accomplishTask(serverId, roleId, TASK_TYPE.BATTLE_MAIN, 1, { warId: battleId })
}
game-server/app/services/thirtyDaysService.ts
+3 -3
View File
@@ -18,7 +18,7 @@ import { deltaDays } from '../pubUtils/util';
*/
export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
activityArray = activityArray.sort((a, b) => {
return a.activityId - b.activityId
});
@@ -41,7 +41,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 activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
@@ -60,7 +60,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 activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecords: ActivityThirtyDaysModelType[] = await ActivityThirtyDaysModel.findData(serverId, activityId, roleId);
let playerPointRecords: ActivityThirtyDaysPointRewardModelType[] = await ActivityThirtyDaysPointRewardModel.findData(activityId, roleId);
game-server/app/services/yuanbaoService.ts
+3 -3
View File
@@ -15,7 +15,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
*/
export async function yuanbaoActivity(serverId: number, roleId: string) {
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.YUAN_BAO_SHOP, true)
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, true)
activityArray = activityArray.sort((a, b) => {
return b.activityId - a.activityId
});
@@ -36,7 +36,7 @@ export async function yuanbaoActivity(serverId: number, roleId: string) {
*
*/
export async function getPlayerYuanbaoShopData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerRecord: UserOrderModelType[] = await UserOrderModel.findOrderByActivityID(activityId, roleId);
let playerData = new YuanBaoShopData(activityData);
@@ -57,7 +57,7 @@ export async function getPlayerYuanbaoShopData(activityId: number, serverId: num
export async function makeYuanbaoShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
activityId: number, productID: string) {
let records = await UserOrderModel.findOrderByProductID(productID, roleId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let playerData = new YuanBaoShopData(activityData);
let item = playerData.findItem(productID);