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

任务：任务去除funcs的判断，直接达成

Browse Source
This commit is contained in:
luying
2021-09-10 16:53:35 +08:00
parent 28f9c65873
commit faf4d25f60
76 changed files with 471 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/activity/dailyRMBGiftsService.ts
+2 -2
View File
@@ -65,7 +65,7 @@ export async function getPlayerDailyRMBGiftsData(activityId: number, serverId: n
* @param {string} productID 商品ID
*
*/
export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.DAILY_RMB_GIFTS) {
@@ -99,7 +99,7 @@ export async function makeDailyRMBGiftsReward(roleId: string, roleName: string,
}
}
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr)
await ActivityDailyRMBGiftsModel.receiveRecord(serverId, activityId, roleId, moment(playerData.beginTime).toDate(), [item.id]);
item.isReceive = true;
return {
game-server/app/services/activity/giftPackageService.ts
+6 -6
View File
@@ -17,7 +17,7 @@ import { decodeArrayListStr } from '../../pubUtils/util';
* @param giftCount 一共消耗多少个礼包
* @param sid
*/
export async function useGiftPackage(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], giftID: number, selected: Array<number> = [], giftCount: number) {
export async function useGiftPackage(roleId: string, roleName: string, sid: string, serverId: number, giftID: number, selected: Array<number> = [], giftCount: number) {
console.log("bbbbbbbb", giftID, selected)
let result = { goods: [], addHeros: [] }
let giftPackageData = gameData.giftPackage.get(giftID);
@@ -39,7 +39,7 @@ export async function useGiftPackage(roleId: string, roleName: string, sid: stri
allReward = reward;
}
result = await addReward(roleId, roleName, sid, serverId, funcs, allReward);
result = await addReward(roleId, roleName, sid, serverId, allReward);
break;
}
case GIFT_PACKAGE_TYPE.SELECTED_X://手选
@@ -57,7 +57,7 @@ export async function useGiftPackage(roleId: string, roleName: string, sid: stri
} else {
allReward = selectedReward;
}
result = await addReward(roleId, roleName, sid, serverId, funcs, allReward);
result = await addReward(roleId, roleName, sid, serverId, allReward);
break;
}
case GIFT_PACKAGE_TYPE.RANDOM_X://随机
@@ -69,7 +69,7 @@ export async function useGiftPackage(roleId: string, roleName: string, sid: stri
let selectedReward = getSelectedReward(giftPackageData, selectedArray)
allReward = allReward.concat(selectedReward);
}
result = await addReward(roleId, roleName, sid, serverId, funcs, allReward);
result = await addReward(roleId, roleName, sid, serverId, allReward);
break;
}
default:
@@ -80,7 +80,7 @@ export async function useGiftPackage(roleId: string, roleName: string, sid: stri
}
//结算奖励的内容
export async function addReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], reward: Array<RewardParam>) {
export async function addReward(roleId: string, roleName: string, sid: string, serverId: number, reward: Array<RewardParam>) {
let giftReward = rewardItemData(reward);
let goodArray = giftReward.goods;
let heroArray = giftReward.heroes;
@@ -89,7 +89,7 @@ export async function addReward(roleId: string, roleName: string, sid: string, s
let goods = await addItems(roleId, roleName, sid, goodArray)
let addHeros = [];
if (heroArray.length > 0) {
let heroResult = await createHeroes(roleId, roleName, sid, serverId, funcs, heroArray);
let heroResult = await createHeroes(roleId, roleName, sid, serverId, heroArray);
goods = goods.concat(heroResult.goods)
addHeros = addHeros.concat(heroResult.heroes);
}
game-server/app/services/activity/growthFundService.ts
+1 -1
View File
@@ -124,7 +124,7 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
* @param {string} productID 商品ID
*
*/
export async function makeGrowthFund(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeGrowthFund(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) {
game-server/app/services/activity/limitPackageService.ts
+2 -2
View File
@@ -101,7 +101,7 @@ export async function newPlayerActivityDays(roleId: string) {
* @param {string} productID 商品ID
*
*/
export async function makeLimitPackageReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeLimitPackageReward(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) {
@@ -127,7 +127,7 @@ export async function makeLimitPackageReward(roleId: string, roleName: string, s
}
let rewardArray = stringToRewardParam(item.reward)
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
let result = await addReward(roleId, roleName, sid, serverId, rewardArray);
await ActivityShopModel.addRecord(activityId, roleId, playerData.roundIndex, item.id);
game-server/app/services/activity/monthlyTicketService.ts
+4 -4
View File
@@ -72,7 +72,7 @@ export async function getPlayerMonthlyTicketData(activityId: number, serverId: n
* @param {string} roleId 角色Id
*
*/
export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number,) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let { createTime } = await RoleModel.findByRoleId(roleId);
@@ -88,7 +88,7 @@ export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName:
if (playerData.todayIndex > playerData.dayIndex) {//今天还没领取
await ActivityMonthlyTicketModel.setDayIndex(serverId, roleId, activityId, playerData.todayIndex);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.baseReward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr)
return result
}
}
@@ -104,7 +104,7 @@ export async function getPlayerMonthlyTicketDayReward(roleId: string, roleName:
* @param {string} productID 商品ID
*
*/
export async function makeMonthlyTicketReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeMonthlyTicketReward(roleId: string, roleName: string, sid: string, serverId: 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) {
@@ -120,7 +120,7 @@ export async function makeMonthlyTicketReward(roleId: string, roleName: string,
let firstReward = playerData.firstReward;
let rewardParamArr: Array<RewardParam> = stringToRewardParam(firstReward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr)
return {
code: 0,
data: Object.assign(result, { item: { isOpen: true, todayIndex: 1 }, activityId: activityData.activityId })
game-server/app/services/activity/popUpShopService.ts
+2 -2
View File
@@ -66,7 +66,7 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
* @param {string} productID 商品ID
*
*/
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string, paramStr: string) {
if (!paramStr) {
return STATUS.ORDER_PARAM_ERROR;
@@ -105,7 +105,7 @@ export async function makePopUpShopReward(roleId: string, roleName: string, sid:
playerData.setPlayerRecords(playerRecord);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr)
return {
game-server/app/services/activity/refreshShopService.ts
+2 -2
View File
@@ -111,7 +111,7 @@ export async function newPlayerActivityDays(roleId: string) {
* @param {number} roundIndex 大富翁重置回合数
*
*/
export async function makeRefreshShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeRefreshShopReward(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string, roundIndex: number) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (!activityData) {
@@ -138,7 +138,7 @@ export async function makeRefreshShopReward(roleId: string, roleName: string, si
}
let rewardArray = stringToRewardParam(item.reward)
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
let result = await addReward(roleId, roleName, sid, serverId, rewardArray);
await ActivityRefreshShopModel.addRecord(activityId, roleId, playerData.roundIndex, item.pageIndex, item.id);
game-server/app/services/activity/selfServiceShopActivityService.ts
+4 -4
View File
@@ -85,7 +85,7 @@ export async function getPlayerActivityData(activityId: number, serverId: number
*
*/
export async function addSelfServiceShopGiftReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[], activityId: number, roundIndex: number, index: number, item: SelfServiceShopItem) {
export async function addSelfServiceShopGiftReward(roleId: string, roleName: string, sid: string, serverId: number, activityId: number, roundIndex: number, index: number, item: SelfServiceShopItem) {
let playerGoods: ActivitySelfServiceGoodsModelType[] = await ActivitySelfServiceGoodsModel.findDataByIndex(activityId, roleId, roundIndex, index);
let rewardArray: Array<RewardParam> = [];
@@ -100,7 +100,7 @@ export async function addSelfServiceShopGiftReward(roleId: string, roleName: str
for (let obj of rewardArray) {
goodsStr += `${obj.type}&${obj.id}&${obj.count}|`;
}
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
let result = await addReward(roleId, roleName, sid, serverId, rewardArray);
//购买记录
console.log('dddddddd', rewardArray.length, serverId, activityId, roleId, roundIndex, index, goodsStr, JSON.stringify(item))
await ActivitySelfServiceShopModel.addBuyRecord(serverId, activityId, roleId, roundIndex, index, goodsStr);
@@ -117,7 +117,7 @@ export async function addSelfServiceShopGiftReward(roleId: string, roleName: str
* @param {string} productID 商品ID
*
*/
export async function makeSelfServerShop(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeSelfServerShop(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
@@ -142,7 +142,7 @@ export async function makeSelfServerShop(roleId: string, roleName: string, sid:
}
}
}
let result = await addSelfServiceShopGiftReward(roleId, roleName, sid, serverId, funcs, activityId, playerData.roundIndex, item.index, item);
let result = await addSelfServiceShopGiftReward(roleId, roleName, sid, serverId, activityId, playerData.roundIndex, item.index, item);
item.buyCount += 1;
return {
code: 0,
game-server/app/services/activity/signInService.ts
+1 -1
View File
@@ -153,7 +153,7 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
* @param {string} productID 商品ID
*
*/
export async function makeSignInVIP(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeSignInVIP(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
if (activityData.type !== ACTIVITY_TYPE.SIGN_IN_VIP) {
game-server/app/services/activity/treasureHuntService.ts
+2 -2
View File
@@ -304,7 +304,7 @@ async function getNextActivityData(serverId: number, roleId: string, oldHuntActi
* @param {string} productID 商品ID
*
*/
export async function makeShop(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeShop(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string) {
// let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let { huntActivityId, huntBeginTime, huntEndTime, huntRoundIndex, activityData } = await getTreasureHuntData(serverId, roleId);
@@ -339,7 +339,7 @@ export async function makeShop(roleId: string, roleName: string, sid: string, se
await ActivityTreasureHuntShopModel.buyShopRecord(activityId, roleId, huntRoundIndex, playerData.todayIndex, cellIndex);
let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr)
item.buyCount += 1;
return {
game-server/app/services/activity/yuanbaoService.ts
+2 -2
View File
@@ -58,7 +58,7 @@ export async function getPlayerYuanbaoShopData(activityId: number, serverId: num
* @param {string} productID 商品ID
*
*/
export async function makeYuanbaoShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
export async function makeYuanbaoShopReward(roleId: string, roleName: string, sid: string, serverId: number,
activityId: number, productID: string) {
let records = await UserOrderModel.findSuccessOrderByProductID(productID, roleId, activityId);
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
@@ -87,7 +87,7 @@ export async function makeYuanbaoShopReward(roleId: string, roleName: string, si
}
}
let result = await addReward(roleId, roleName, sid, serverId, funcs, arr)
let result = await addReward(roleId, roleName, sid, serverId, arr)
item.buyCount += 1;
return {
code: 0,